Edit Data from queue, remove delete button

Apps/Motion/AndroidManifest.xml

@@ -79,8 +79,8 @@
         <activity
             android:name="edu.uml.cs.isense.queue.QueueEditData"
             android:label="Edit Data"
-            android:theme="@style/AppThemeDialog"
-            tools:ignore="MissingRegistered" />
+            android:windowSoftInputMode="adjustPan"
+            android:theme="@style/AppTheme"/>
         <activity
             android:name="edu.uml.cs.isense.queue.QueueEditRename"
             android:label="Rename Data Set"

Apps/Writer/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="edu.uml.cs.isense.writer"
-    android:versionCode="7"
+    android:versionCode="8"
     android:versionName="1.2.0" >
 
   	<uses-permission android:name="android.permission.VIBRATE" />
@@ -74,7 +74,8 @@
         <activity
             android:name="edu.uml.cs.isense.queue.QueueEditData"
             android:label="Edit Data"
-            android:theme="@style/AppThemeDialog"/>
+            android:windowSoftInputMode="adjustPan"
+            android:theme="@style/AppTheme"/>
         <activity
             android:name="edu.uml.cs.isense.queue.QueueEditRename"
             android:label="Rename Data Set"

Apps/Writer/res/layout-v11/manual_entry.xml

@@ -7,7 +7,6 @@
     <LinearLayout
         android:id="@+id/dataset_name_layout"
         android:orientation="horizontal"
-        android:layout_below="@+id/toolbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:padding="10dp">

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

@@ -17,7 +17,6 @@
 
 package edu.uml.cs.isense.writer;
 
-import android.annotation.SuppressLint;
 import android.content.Context;
 import android.content.Intent;
 import android.location.Criteria;
@@ -94,7 +93,6 @@ public class ManualEntry extends ActionBarActivity implements LocationListener {
 
     private int scrollY = 0;
 
-    @SuppressLint("NewApi")
 	@Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

Libs/iSENSE Imports/AndroidManifest.xml

@@ -14,11 +14,11 @@
     <activity
         android:name=".queue.QueueAlter"
         android:label="Alter Data Set"
-        android:theme="@style/AppThemeDialog" />
+        android:theme="@style/AppTheme" />
     <activity
         android:name=".queue.QueueEditData"
         android:label="Edit Data"
-        android:theme="@style/AppThemeDialog" />
+        android:theme="@style/AppThemeNoActionBar" />
     <activity
         android:name=".queue.QueueEditRename"
         android:label="Rename Data Set"

Libs/iSENSE Imports/res/layout-v11/queueblock_alter.xml

@@ -60,16 +60,6 @@
                 android:text="@string/select_proj"
                 android:textSize="16sp" />
 
-            <Button
-                android:id="@+id/queuealter_delete"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginLeft="20dp"
-                android:layout_marginRight="20dp"
-                android:layout_marginTop="5dp"
-                android:padding="10dp"
-                android:text="@string/delete"
-                android:textSize="16sp" />
         </LinearLayout>
     </ScrollView>
 

Libs/iSENSE Imports/res/layout-v11/queueedit_data.xml

@@ -11,7 +11,6 @@
         android:layout_above="@+id/buttons"
         android:layout_alignParentTop="true"
         android:background="@android:color/transparent"
-        android:padding="5dp"
         android:scrollbars="vertical" >
 
         <LinearLayout
@@ -48,12 +47,12 @@
             android:text="@android:string/cancel" />
 
         <Button
-            android:id="@+id/queueedit_data_okay"
+            android:id="@+id/queueedit_data_save"
             style="?android:attr/buttonBarButtonStyle"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_weight="1"
-            android:text="@android:string/ok" />
+            android:text="@string/save" />
     </LinearLayout>
 
 </RelativeLayout>

Libs/iSENSE Imports/res/layout/queueblock_alter.xml

@@ -57,17 +57,6 @@
             android:text="@string/select_proj"
             android:textSize="16sp" />
 
-        <Button
-            android:id="@+id/queuealter_delete"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="20dp"
-            android:layout_marginRight="20dp"
-            android:layout_marginTop="5dp"
-            android:padding="10dp"
-            android:text="@string/delete"
-            android:textSize="16sp" />
-
         <Button
             android:id="@+id/queuealter_cancel"
             android:layout_width="match_parent"

Libs/iSENSE Imports/res/layout/queueedit_data.xml

@@ -43,12 +43,11 @@
             android:text="@android:string/cancel" />
 
         <Button
-            android:id="@+id/queueedit_data_okay"
+            android:id="@+id/queueedit_data_save"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:layout_margin="2dp"
             android:layout_weight="1"
-            android:text="@android:string/ok" />
+            android:text="@string/save" />
     </LinearLayout>
 
 </RelativeLayout>

Libs/iSENSE Imports/res/values/strings.xml

@@ -30,7 +30,7 @@
     <string name="contentDescBack">Back</string>
     <string name="prompt">Select which data sets you would like to upload to iSENSE.
 	    \n\t&#8226; Tap data sets to enable/disable them for upload.
-	    \n\t&#8226; Long press a data set to reconfigure it.</string>
+	    \n\t&#8226; Long press a data set to edit it.</string>
     <string name="type_data">Type: Data</string>
     <string name="type_picture">Type: Picture</string>
     <string name="select_all">Select All</string>
@@ -179,6 +179,7 @@
     <string name="alt">Altitude</string>
     <string name="light">Luminous Flux (Light)</string>
     <string name="heading">Heading</string>
+    <string name="save">Save</string>
 
 
 

Libs/iSENSE Imports/src/edu/uml/cs/isense/queue/QDataSet.java

@@ -106,8 +106,6 @@ public enum Type {
 	 *            - If type is QDataSet.DATA, we look here.
 	 * @param picture
 	 *            - If type is QDataSet.PIC, we look here.
-	 * @param requestDataLabelInOrder
-	 * 			  - If data is already in the correct order and just needs to be given field IDs
 	 */
 	public QDataSet(String name, String desc, Type type, String data,
 			File picture, String projID, LinkedList<String> fields, Boolean dataAlreadyInOrder) {

Libs/iSENSE Imports/src/edu/uml/cs/isense/queue/QueueAlter.java

@@ -1,12 +1,12 @@
 package edu.uml.cs.isense.queue;
 
-import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.v7.app.ActionBarActivity;
 import android.view.View;
 import android.view.View.OnClickListener;
 import android.widget.Button;
+
 import edu.uml.cs.isense.R;
 
 /**
@@ -18,7 +18,7 @@
  */
 public class QueueAlter extends ActionBarActivity {
 
-	private Button rename, changeData, selectProj, delete, cancel;
+	private Button rename, changeData, selectProj, cancel;
 
 	protected final static String RETURN_CODE = "return_code";
 	protected final static String IS_ALTERABLE = "is_alterable";
@@ -37,13 +37,12 @@ public void onCreate(Bundle savedInstanceState) {
 		rename     = (Button) findViewById(R.id.queuealter_rename     );
 		changeData = (Button) findViewById(R.id.queuealter_change_data);
 		selectProj = (Button) findViewById(R.id.queuealter_choose_proj);
-		delete     = (Button) findViewById(R.id.queuealter_delete     );
 		cancel     = (Button) findViewById(R.id.queuealter_cancel     );
 
 		Bundle extras = getIntent().getExtras();
 
 		if (extras != null) {
-			boolean isAlterable = false; //extras.getBoolean(IS_ALTERABLE); TODO editing data is broken
+			boolean isAlterable = extras.getBoolean(IS_ALTERABLE);
 			if (!isAlterable) {
 				changeData.setVisibility(View.GONE);
 			}
@@ -84,16 +83,6 @@ public void onClick(View v) {
 			}
 		});
 
-		delete.setOnClickListener(new OnClickListener() {
-			@Override
-			public void onClick(View v) {
-				Intent iRet = new Intent(QueueAlter.this, QueueLayout.class);
-				iRet.putExtra(RETURN_CODE, DELETE);
-				setResult(RESULT_OK, iRet);
-				finish();
-			}
-		});
-
 		cancel.setOnClickListener(new OnClickListener() {
 			@Override
 			public void onClick(View v) {