icons correct sizes, fixed field restrictions

Apps/Motion/AndroidManifest.xml

@@ -19,7 +19,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/isense_graph"
+        android:icon="@mipmap/isense_graph"
         android:label="@string/display_name" >
 
         <service android:enabled="true" android:name="edu.uml.cs.isense.motion.RecordingService" />

Apps/Motion/src/edu/uml/cs/isense/motion/Motion.java

@@ -34,6 +34,7 @@
 import android.support.v4.view.PagerAdapter;
 import android.support.v4.view.ViewPager;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
@@ -68,7 +69,7 @@
 import edu.uml.cs.isense.waffle.Waffle;
 
 
-public class Motion extends ActionBarActivity {
+public class Motion extends AppCompatActivity {
 
     public static final String DEFAULT_PROJ = "-1";
     public static final int DEFAULT_RATE = 50;
@@ -222,14 +223,9 @@ public void run() {
             startStop.setText("Hold to Start");
         }
 
-        dataSetName = settings.getString(EnterName.Name_Key, "");
+        dataSetName = settings.getString(EnterName.Name_Key, "Motion");
 
-        if (dataSetName.length() == 0) {
-            Intent iEnterName = new Intent(this, EnterName.class);
-            startActivityForResult(iEnterName, RESULT_GOT_NAME);
-        } else {
-            nameB.setText(dataSetName);
-        }
+        nameB.setText(dataSetName);
 
         String projId = ProjectManager.getProject(mContext);
 

Apps/Motion/src/edu/uml/cs/isense/motion/PresetScreen.java

@@ -111,6 +111,9 @@ public void onClick(View v) {
                 editor.putString(Presets.LAST_PRESET, Presets.GPS);
 
                 Intent resultIntent = new Intent();
+
+                resultIntent.putExtra(Presets.RATE, Presets.GPS_PROJECT_RATE);
+                resultIntent.putExtra(Presets.LENGTH, Presets.GPS_PROJECT_LENGTH);
                 resultIntent.putExtra(Presets.PROJECT, "-1");
                 setResult(Activity.RESULT_OK, resultIntent);
 

Apps/Motion/src/edu/uml/cs/isense/motion/RecordingService.java

@@ -1,6 +1,5 @@
 package edu.uml.cs.isense.motion;
 
-import android.annotation.SuppressLint;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -22,11 +21,9 @@
 import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.Locale;
-import java.util.Timer;
 
 import edu.uml.cs.isense.comm.API;
 import edu.uml.cs.isense.dfm.DataFieldManager;
-import edu.uml.cs.isense.motion.dialogs.EnterName;
 import edu.uml.cs.isense.proj.ProjectManager;
 import edu.uml.cs.isense.queue.QDataSet.Type;
 
@@ -82,7 +79,7 @@ public void onCreate() {
             builder.setContentText("Recording Data");
             builder.setTicker("Started Recording");
             builder.setSmallIcon(R.drawable.ic_stat_name);
-            Bitmap bm = BitmapFactory.decodeResource(getResources(), R.drawable.ic_launcher);
+            Bitmap bm = BitmapFactory.decodeResource(getResources(), R.mipmap.isense_graph);
             builder.setLargeIcon(bm);
             builder.setContentIntent(pendingIntent);
             builder.setOngoing(true);

Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/About.java

@@ -2,11 +2,12 @@
 
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import edu.uml.cs.isense.motion.R;
 
-public class About extends ActionBarActivity {
+public class About extends AppCompatActivity {
 
     @Override
     public void onCreate(Bundle savedInstanceBundle) {

Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ContributorKeyDialog.java

@@ -8,14 +8,15 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.EditText;
 import edu.uml.cs.isense.comm.API;
 import edu.uml.cs.isense.motion.R;
 import edu.uml.cs.isense.waffle.Waffle;
 
-public class ContributorKeyDialog extends ActionBarActivity {
+public class ContributorKeyDialog extends AppCompatActivity {
 
 	Button ok, cancel;
 	EditText keyField;

Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/DataActivity.java

@@ -4,12 +4,13 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import edu.uml.cs.isense.comm.Connection;
 import edu.uml.cs.isense.motion.R;
 
-public class DataActivity extends ActionBarActivity {
+public class DataActivity extends AppCompatActivity {
 
 	private Button iSENSE_Button;
 	private Button discard_Button;

Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/DurationDialog.java

@@ -4,6 +4,7 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.widget.Button;
@@ -14,7 +15,7 @@
 import edu.uml.cs.isense.motion.Motion;
 import edu.uml.cs.isense.motion.R;
 
-public class DurationDialog extends ActionBarActivity {
+public class DurationDialog extends AppCompatActivity {
 
 	Button ok, cancel;
 	EditText input;

Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/MessageDialogTemplate.java

@@ -5,12 +5,13 @@
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import android.widget.TextView;
 import edu.uml.cs.isense.motion.R;
 
-public class MessageDialogTemplate extends ActionBarActivity {
+public class MessageDialogTemplate extends AppCompatActivity {
 
 	Button pos, neg;
 

Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/Presets.java

@@ -5,6 +5,7 @@
 import android.content.SharedPreferences;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
@@ -13,7 +14,7 @@
 import edu.uml.cs.isense.motion.Motion;
 import edu.uml.cs.isense.motion.R;
 
-public class Presets extends ActionBarActivity {
+public class Presets extends AppCompatActivity {
     public static final String PROJECT = "project";
     public static final String LENGTH = "length";
     public static final String RATE = "rate";

Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/RateDialog.java

@@ -1,23 +1,18 @@
 package edu.uml.cs.isense.motion.dialogs;
 
-import android.app.Activity;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
-import android.widget.EditText;
 import android.widget.RadioButton;
-import android.widget.Spinner;
 
 import edu.uml.cs.isense.motion.Motion;
 import edu.uml.cs.isense.motion.R;
 
-public class RateDialog extends ActionBarActivity {
+public class RateDialog extends AppCompatActivity {
 
 	Button ok, cancel;
-	EditText input;
-	Spinner spinner;
 	int rate;
 
 	@Override

Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/RecordSettings.java

@@ -1,16 +1,15 @@
 package edu.uml.cs.isense.motion.dialogs;
 
-import android.app.Activity;
 import android.content.SharedPreferences;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.ViewGroup.LayoutParams;
 import android.widget.Button;
 import android.widget.CheckedTextView;
 import edu.uml.cs.isense.motion.R;
 
-public class RecordSettings extends ActionBarActivity {
+public class RecordSettings extends AppCompatActivity {
 
 	private boolean Xchecked = false, Ychecked = true, Zchecked = false,
 			Magchecked = false;

Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ResetToDefaults.java

@@ -1,13 +1,12 @@
 package edu.uml.cs.isense.motion.dialogs;
 
-import android.app.Activity;
 import android.os.Bundle;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import edu.uml.cs.isense.motion.R;
 
-public class ResetToDefaults extends ActionBarActivity {
+public class ResetToDefaults extends AppCompatActivity {
 
 	Button reset, noreset;
 

Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/SaveModeDialog.java

@@ -3,11 +3,12 @@
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import edu.uml.cs.isense.motion.R;
 
-public class SaveModeDialog extends ActionBarActivity {
+public class SaveModeDialog extends AppCompatActivity {
 
 	Button ok, cancel;
 

Apps/Motion/src/edu/uml/cs/isense/motion/dialogs/ViewData.java

@@ -5,12 +5,13 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.widget.Button;
 import edu.uml.cs.isense.motion.Motion;
 import edu.uml.cs.isense.motion.R;
 
-public class ViewData extends ActionBarActivity {
+public class ViewData extends AppCompatActivity {
 
 	Button view, cancel;
 

Apps/Pictures/AndroidManifest.xml

@@ -28,7 +28,7 @@
 
     <application
         android:allowBackup="false"
-        android:icon="@drawable/ic_launcher"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name" >
 
         <uses-library android:name="android.test.runner" />
@@ -100,6 +100,10 @@
             android:name="edu.uml.cs.isense.queue.QueueAlter"
             android:label="Alter Data Set"
             android:theme="@style/AppThemeDialog" />
+        <activity
+            android:name="edu.uml.cs.isense.credentials.LoginOrKeyDialog"
+            android:label="Login or Key"
+            android:theme="@style/AppThemeDialog" />
         <activity
             android:name="edu.uml.cs.isense.queue.QueueEditData"
             android:label="Edit Data"

Apps/Pictures/res/menu/menu.xml

@@ -8,7 +8,7 @@
           android:title="@string/project"
           app:showAsAction="ifRoom"/>
     <item android:id="@+id/MENU_ITEM_LOGIN"
-          android:title="@string/login"
+          android:title="@string/account"
           app:showAsAction="ifRoom"/>
     <item android:id="@+id/MENU_ITEM_CONTINUOUS"
           android:title="@string/continuous"

Apps/Pictures/res/values/strings.xml

@@ -57,7 +57,8 @@
 
 	<string name="other">Other</string>
 	<string name="project">Project</string>
-	<string name="login">Account</string>
+	<string name="login">Login</string>
+	<string name="account">Account</string>
 	<string name="continuous">Continuously Take Photos</string>
 	<string name="interval">Time Interval (seconds):</string>
 	<string name="takePicContinuous">Press Here to Continuously Take Pictures</string>

Apps/Pictures/src/edu/uml/cs/isense/riverwalk/Continuous.java

@@ -2,14 +2,15 @@
 
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.EditText;
 import android.view.ViewGroup;
 
-public class Continuous extends ActionBarActivity {
+public class Continuous extends AppCompatActivity {
 
 	@Override
 	protected void onCreate(Bundle savedInstanceState) {

Apps/Pictures/src/edu/uml/cs/isense/riverwalk/Pictures.java

@@ -35,6 +35,7 @@
 import android.provider.Settings;
 import android.support.v4.content.CursorLoader;
 import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.Display;
 import android.view.Menu;
@@ -62,7 +63,7 @@
 import edu.uml.cs.isense.supplements.OrientationManager;
 import edu.uml.cs.isense.waffle.Waffle;
 
-public class Pictures extends ActionBarActivity implements LocationListener {
+public class Pictures extends AppCompatActivity implements LocationListener {
 	private static final int CAMERA_PIC_REQUESTED = 101;
 	private static final int LOGIN_REQUESTED = 102;
 	private static final int NO_GPS_REQUESTED = 103;

Apps/Pictures/src/edu/uml/cs/isense/riverwalk/dialogs/CameraPreview.java

@@ -63,7 +63,7 @@ private void setBestPictureSize() {
     		int h = size.height, w = size.width;
 
     		// If this height/width is better, use it
-    		if (h >= mHeight || w >= mWidth) {
+    		if (w * h > mHeight * mWidth) {
     			mHeight = h;
     			mWidth  = w;
     			continue;

Apps/Writer/AndroidManifest.xml

@@ -18,7 +18,7 @@
 
     <application
         android:allowBackup="true"
-        android:icon="@drawable/isense_manual"
+        android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:theme="@style/AppTheme" >
         <activity

Apps/Writer/src/edu/uml/cs/isense/writer/ManualEntry.java

@@ -26,8 +26,7 @@
 import android.os.AsyncTask;
 import android.os.Bundle;
 import android.os.CountDownTimer;
-import android.support.v7.app.ActionBar;
-import android.support.v7.app.ActionBarActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.CardView;
 import android.text.InputType;
 import android.view.LayoutInflater;
@@ -65,7 +64,7 @@
 import edu.uml.cs.isense.queue.UploadQueue;
 import edu.uml.cs.isense.waffle.Waffle;
 
-public class ManualEntry extends ActionBarActivity implements LocationListener {
+public class ManualEntry extends AppCompatActivity implements LocationListener {
     public static Context mContext;
     private API api;
     private Boolean useDev = false;
@@ -181,10 +180,6 @@ public void onClick(View v) {
 
         });
 
-        // Initialize action bar customization for API >= 11
-        if (android.os.Build.VERSION.SDK_INT >= 11) {
-            ActionBar bar = getSupportActionBar();
-        }
 
         datapointsLayout = (LinearLayout) findViewById(R.id.datapoints_ll);
         scrollView = (ScrollView) findViewById(R.id.datapoints_sv);
@@ -472,7 +467,7 @@ public void run() {
 
                 } else if (field.type == RProjectField.TYPE_TEXT) {
                     //if no restrictions we get back a string "null"
-                    if (field.restrictions == "null") {
+                    if (field.restrictions.equals("[]")) {
                         ViewGroup singlefield = new RelativeLayout(mContext);
                         inflater.inflate(R.layout.field, singlefield);