From 517026bef3559d44ac7184eb7b172414f90b8e11 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Tue, 20 Mar 2012 18:46:24 -0700
Subject: [PATCH] Modify UploadServiceChooser dialog to ICS style. - Use
 AlertDialog title and buttons - Use
 @android:style/TextAppearance.DeviceDefault.Medium - Use 8dp for margin
 between elements

---
 .../res/layout/upload_service_chooser.xml     | 165 +++++++++---------
 MyTracks/res/values/strings.xml               |   5 +
 MyTracks/res/values/styles.xml                |  22 ---
 .../UploadServiceChooserActivity.java         | 108 ++++++------
 .../UploadServiceChooserActivityTest.java     |  28 +--
 5 files changed, 148 insertions(+), 180 deletions(-)

diff --git a/MyTracks/res/layout/upload_service_chooser.xml b/MyTracks/res/layout/upload_service_chooser.xml
index ca750d794..599f5f421 100644
--- a/MyTracks/res/layout/upload_service_chooser.xml
+++ b/MyTracks/res/layout/upload_service_chooser.xml
@@ -14,93 +14,92 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
   android:layout_height="fill_parent"
-  android:layout_width="fill_parent"
-  android:orientation="vertical">
-  <TextView
-    android:background="@drawable/list_bar"
+  android:layout_width="fill_parent" >
+
+  <TableLayout
     android:layout_height="wrap_content"
+    android:layout_margin="8dp"
     android:layout_width="fill_parent"
-    android:paddingLeft="10dp"
-    android:text="@string/send_google_title"
-    android:textColor="@color/white"
-    android:textSize="20sp"/>
-  <ScrollView
-    android:layout_height="0dp"
-    android:layout_margin="5dp"
-    android:layout_weight="1"
-    android:layout_width="fill_parent">
-    <TableLayout
-      android:layout_height="wrap_content"
-      android:layout_width="fill_parent"
-      android:stretchColumns="1">
+    android:stretchColumns="1" >
 
-      <!-- Google Maps -->
-      <TableRow android:id="@+id/send_google_maps_row">
-        <ImageView
-          android:contentDescription="@string/send_google_maps"
-          android:src="@drawable/maps_icon"
-          style="@style/SendGoogleImageView"/>
-        <CheckBox
-          android:id="@+id/send_google_maps"
-          android:text="@string/send_google_maps"
-          style="@style/SendGoogleCheckBox"/>
-      </TableRow>
-      <TableRow android:id="@+id/send_google_maps_option_row">
-        <RadioGroup
-          android:layout_column="1"
+    <TableRow android:id="@+id/send_google_maps_row" >
+
+      <ImageView
+        android:contentDescription="@string/send_google_maps"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/maps_icon" />
+
+      <CheckBox
+        android:id="@+id/send_google_maps"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/send_google_maps" />
+    </TableRow>
+
+    <TableRow android:id="@+id/send_google_maps_option_row" >
+
+      <RadioGroup
+        android:layout_column="1"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp" >
+
+        <RadioButton
+          android:id="@+id/send_google_new_map"
           android:layout_height="wrap_content"
-          android:layout_marginLeft="10dp"
-          android:layout_width="0dp">
-          <RadioButton
-            android:id="@+id/send_google_new_map"
-            android:text="@string/send_google_new_map"
-            style="@style/SendGoogleRadioButton"/>
-          <RadioButton
-            android:id="@+id/send_google_existing_map"
-            android:text="@string/send_google_existing_map"
-            style="@style/SendGoogleRadioButton"/>
-        </RadioGroup>
-      </TableRow>
+          android:layout_width="wrap_content"
+          style="@android:style/TextAppearance.DeviceDefault.Medium"
+          android:text="@string/send_google_new_map" />
 
-      <!-- Google Fusion Tables -->
-      <TableRow android:id="@+id/send_google_fusion_tables_row">
-        <ImageView
-          android:contentDescription="@string/send_google_fusion_tables"
-          android:src="@drawable/googledocs_icon"
-          style="@style/SendGoogleImageView"/>
-        <CheckBox
-          android:id="@+id/send_google_fusion_tables"
-          android:text="@string/send_google_fusion_tables"
-          style="@style/SendGoogleCheckBox"/>
-      </TableRow>
+        <RadioButton
+          android:id="@+id/send_google_existing_map"
+          android:layout_height="wrap_content"
+          android:layout_width="wrap_content"
+          style="@android:style/TextAppearance.DeviceDefault.Medium"
+          android:text="@string/send_google_existing_map" />
+      </RadioGroup>
+    </TableRow>
 
-      <!-- Google Docs -->
-      <TableRow android:id="@+id/send_google_docs_row">
-        <ImageView
-          android:contentDescription="@string/send_google_docs"
-          android:src="@drawable/googledocs_icon"
-          style="@style/SendGoogleImageView"/>
-        <CheckBox
-          android:id="@+id/send_google_docs"
-          android:text="@string/send_google_docs"
-          style="@style/SendGoogleCheckBox"/>
-      </TableRow>
-    </TableLayout>
-  </ScrollView>
-  <LinearLayout style="@style/ButtonLayout">
-    <LinearLayout style="@style/ButtonSpacer"/>
-    <Button
-      android:id="@+id/send_google_send_now"
-      android:layout_gravity="left"
-      android:text="@string/send_google_send_now"
-      style="@style/Button"/>
-    <Button
-      android:id="@+id/send_google_cancel"
-      android:layout_gravity="right"
-      android:text="@string/generic_cancel"
-      style="@style/Button"/>
-    <LinearLayout style="@style/ButtonSpacer"/>
-  </LinearLayout>
-</LinearLayout>
+    <TableRow android:id="@+id/send_google_fusion_tables_row" >
+
+      <ImageView
+        android:contentDescription="@string/send_google_fusion_tables"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/googledocs_icon" />
+
+      <CheckBox
+        android:id="@+id/send_google_fusion_tables"
+        android:layout_gravity="center_vertical"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/send_google_fusion_tables" />
+    </TableRow>
+    <TableRow android:id="@+id/send_google_docs_row" >
+
+      <ImageView
+        android:contentDescription="@string/send_google_docs"
+        android:layout_height="wrap_content"
+        android:layout_width="wrap_content"
+        android:src="@drawable/googledocs_icon" />
+
+      <CheckBox
+        android:id="@+id/send_google_docs"
+        android:layout_gravity="center_vertical"
+        android:layout_height="fill_parent"
+        android:layout_marginLeft="8dp"
+        android:layout_width="0dp"
+        style="@android:style/TextAppearance.DeviceDefault.Medium"
+        android:text="@string/send_google_docs" />
+    </TableRow>
+  </TableLayout>
+
+</ScrollView>
\ No newline at end of file
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index ec8c509b1..548ee8342 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -1343,6 +1343,11 @@ limitations under the License.
       found.">
     No account found
   </string>
+  <string name="send_google_no_service_selected"
+    translation_description="When sending a track to Google, a message indicating that the user has
+      not selected any Google service and no data is sent.">
+    You did not select any service. No data is sent.
+  </string>
   <string name="send_google_progress_title"
     translation_description="When sending a track to a Google service, the title on the progress
       dialog.
diff --git a/MyTracks/res/values/styles.xml b/MyTracks/res/values/styles.xml
index f2741024e..22adcb6b5 100644
--- a/MyTracks/res/values/styles.xml
+++ b/MyTracks/res/values/styles.xml
@@ -95,28 +95,6 @@ limitations under the License.
     <item name="android:layout_width">wrap_content</item>
   </style>
 
-  <!-- Send Google CheckBox -->
-  <style name="SendGoogleCheckBox">
-    <item name="android:checked">true</item>
-    <item name="android:layout_height">fill_parent</item>
-    <item name="android:layout_marginLeft">10dp</item>
-    <item name="android:layout_width">0dp</item>
-    <item name="android:textSize">18sp</item>
-  </style>
-
-  <!-- Send Google ImageView -->
-  <style name="SendGoogleImageView">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-  </style>
-
-  <!-- Send Google RadioButton -->
-  <style name="SendGoogleRadioButton">
-    <item name="android:layout_height">wrap_content</item>
-    <item name="android:layout_width">wrap_content</item>
-    <item name="android:textSize">18sp</item>
-  </style>
-
   <style name="SensorStateLabel">
     <item name="android:layout_height">wrap_content</item>
     <item name="android:layout_width">fill_parent</item>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
index 5a18b927b..0e0433cb7 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivity.java
@@ -22,6 +22,7 @@ import com.google.android.maps.mytracks.R;
 import com.google.common.annotations.VisibleForTesting;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Dialog;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -30,27 +31,26 @@ import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.os.Bundle;
 import android.view.View;
-import android.view.Window;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.CompoundButton;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 import android.widget.RadioButton;
 import android.widget.TableRow;
+import android.widget.Toast;
 
 import java.util.ArrayList;
 
 /**
  * A chooser to select the Google services to upload a track to.
- *
+ * 
  * @author Jimmy Shih
  */
 public class UploadServiceChooserActivity extends Activity {
 
-  private static final int SERVICE_PICKER_DIALOG = 1;
+  private static final int DIALOG_CHOOSER_ID = 0;
 
   private SendRequest sendRequest;
-  private Dialog dialog;
+  private AlertDialog alertDialog;
 
   private TableRow mapsTableRow;
   private TableRow fusionTablesTableRow;
@@ -64,9 +64,6 @@ public class UploadServiceChooserActivity extends Activity {
   private RadioButton newMapRadioButton;
   private RadioButton existingMapRadioButton;
 
-  private Button cancel;
-  private Button send;
-
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
@@ -76,35 +73,26 @@ public class UploadServiceChooserActivity extends Activity {
   @Override
   protected void onResume() {
     super.onResume();
-    showDialog(SERVICE_PICKER_DIALOG);
+    showDialog(DIALOG_CHOOSER_ID);
   }
 
   @Override
   protected Dialog onCreateDialog(int id) {
     switch (id) {
-      case SERVICE_PICKER_DIALOG:
-        dialog = new Dialog(this);
-        dialog.requestWindowFeature(Window.FEATURE_NO_TITLE);
-        dialog.setContentView(R.layout.upload_service_chooser);
-        dialog.setCancelable(true);
-        dialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
-          @Override
-          public void onCancel(DialogInterface d) {
-            finish();
-          }
-        });
+      case DIALOG_CHOOSER_ID:
+        View view = getLayoutInflater().inflate(R.layout.upload_service_chooser, null);
 
-        mapsTableRow = (TableRow) dialog.findViewById(R.id.send_google_maps_row);
-        fusionTablesTableRow = (TableRow) dialog.findViewById(R.id.send_google_fusion_tables_row);
-        docsTableRow = (TableRow) dialog.findViewById(R.id.send_google_docs_row);
+        mapsTableRow = (TableRow) view.findViewById(R.id.send_google_maps_row);
+        fusionTablesTableRow = (TableRow) view.findViewById(R.id.send_google_fusion_tables_row);
+        docsTableRow = (TableRow) view.findViewById(R.id.send_google_docs_row);
 
-        mapsCheckBox = (CheckBox) dialog.findViewById(R.id.send_google_maps);
-        fusionTablesCheckBox = (CheckBox) dialog.findViewById(R.id.send_google_fusion_tables);
-        docsCheckBox = (CheckBox) dialog.findViewById(R.id.send_google_docs);
+        mapsCheckBox = (CheckBox) view.findViewById(R.id.send_google_maps);
+        fusionTablesCheckBox = (CheckBox) view.findViewById(R.id.send_google_fusion_tables);
+        docsCheckBox = (CheckBox) view.findViewById(R.id.send_google_docs);
 
-        mapsOptionTableRow = (TableRow) dialog.findViewById(R.id.send_google_maps_option_row);
-        newMapRadioButton = (RadioButton) dialog.findViewById(R.id.send_google_new_map);
-        existingMapRadioButton = (RadioButton) dialog.findViewById(R.id.send_google_existing_map);
+        mapsOptionTableRow = (TableRow) view.findViewById(R.id.send_google_maps_option_row);
+        newMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_new_map);
+        existingMapRadioButton = (RadioButton) view.findViewById(R.id.send_google_existing_map);
 
         // Setup checkboxes
         OnCheckedChangeListener checkBoxListener = new OnCheckedChangeListener() {
@@ -116,31 +104,48 @@ public class UploadServiceChooserActivity extends Activity {
         fusionTablesCheckBox.setOnCheckedChangeListener(checkBoxListener);
         docsCheckBox.setOnCheckedChangeListener(checkBoxListener);
 
-        // Setup buttons
-        cancel = (Button) dialog.findViewById(R.id.send_google_cancel);
-        cancel.setOnClickListener(new View.OnClickListener() {
-          public void onClick(View v) {
-            finish();
-          }
-        });
-        send = (Button) dialog.findViewById(R.id.send_google_send_now);
-        send.setOnClickListener(new View.OnClickListener() {
-          public void onClick(View v) {
-            saveState();
-            startNextActivity();
-          }
-        });
-
         // Setup initial state
         initState();
 
         // Update state based on sendRequest
         updateStateBySendRequest();
 
-        // Update state based on current user selection
+        // Update state based on current selection
         updateStateBySelection();
 
-        return dialog;
+        alertDialog = new AlertDialog.Builder(this)
+            .setCancelable(true)
+            .setNegativeButton(R.string.generic_cancel, new DialogInterface.OnClickListener() {
+                @Override
+              public void onClick(DialogInterface dialog, int which) {
+                finish();
+              }
+            })
+            .setOnCancelListener(new DialogInterface.OnCancelListener() {
+                @Override
+              public void onCancel(DialogInterface d) {
+                finish();
+              }
+            })
+            .setPositiveButton(
+                R.string.send_google_send_now, new DialogInterface.OnClickListener() {
+
+                    @Override
+                  public void onClick(DialogInterface dialog, int which) {
+                    saveState();
+                    if (sendMaps() || sendFusionTables() || sendDocs()) {
+                      startNextActivity();
+                    } else {
+                      Toast.makeText(UploadServiceChooserActivity.this,
+                          R.string.send_google_no_service_selected, Toast.LENGTH_LONG).show();
+                      finish();
+                    }
+                  }
+                })
+            .setTitle(R.string.send_google_title)
+            .setView(view)
+            .create();
+        return alertDialog;
       default:
         return null;
     }
@@ -186,7 +191,6 @@ public class UploadServiceChooserActivity extends Activity {
    */
   private void updateStateBySelection() {
     mapsOptionTableRow.setVisibility(sendMaps() ? View.VISIBLE : View.GONE);
-    send.setEnabled(sendMaps() || sendFusionTables() || sendDocs());
   }
 
   /**
@@ -242,7 +246,7 @@ public class UploadServiceChooserActivity extends Activity {
     startActivity(intent);
     finish();
   }
-  
+
   /**
    * Sends stats to Google Analytics.
    */
@@ -259,12 +263,12 @@ public class UploadServiceChooserActivity extends Activity {
     }
     AnalyticsUtils.sendPageViews(this, pages.toArray(new String[pages.size()]));
   }
-  
+
   @VisibleForTesting
-  Dialog getDialog() {
-    return dialog;
+  AlertDialog getAlertDialog() {
+    return alertDialog;
   }
-  
+
   @VisibleForTesting
   SendRequest getSendRequest() {
     return sendRequest;
diff --git a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java
index 50f5dd020..a4ca0b177 100644
--- a/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java
+++ b/MyTracksTest/src/com/google/android/apps/mytracks/io/sendtogoogle/UploadServiceChooserActivityTest.java
@@ -24,7 +24,6 @@ import android.content.Intent;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.Editor;
 import android.test.ActivityInstrumentationTestCase2;
-import android.widget.Button;
 import android.widget.CheckBox;
 import android.widget.RadioButton;
 
@@ -59,7 +58,6 @@ public class UploadServiceChooserActivityTest extends
     assertTrue(getMapsCheckBox().isShown());
     assertTrue(getFusionTablesCheckBox().isShown());
     assertTrue(getDocsCheckBox().isShown());
-    assertTrue(getCancelButton().isEnabled());
 
     // Clicks to disable all send items.
     uploadServiceChooserActivity.runOnUiThread(new Runnable() {
@@ -79,11 +77,9 @@ public class UploadServiceChooserActivityTest extends
     assertTrue(getMapsCheckBox().isShown());
     assertTrue(getFusionTablesCheckBox().isShown());
     assertTrue(getDocsCheckBox().isShown());
-    assertTrue(getCancelButton().isEnabled());
 
     assertFalse(getNewMapRadioButton().isShown());
     assertFalse(getExistingMapRadioButton().isShown());
-    assertFalse(getSendButton().isEnabled());
   }
 
   /**
@@ -94,7 +90,6 @@ public class UploadServiceChooserActivityTest extends
     initialActivity(true, false, false);
     instrumentation.waitForIdleSync();
     assertTrue(getMapsCheckBox().isShown());
-    assertTrue(getCancelButton().isEnabled());
 
     // Clicks to enable this items.
     uploadServiceChooserActivity.runOnUiThread(new Runnable() {
@@ -108,8 +103,6 @@ public class UploadServiceChooserActivityTest extends
     assertTrue(getMapsCheckBox().isShown());
     assertTrue(getNewMapRadioButton().isShown());
     assertTrue(getExistingMapRadioButton().isShown());
-    assertTrue(getSendButton().isEnabled());
-    assertTrue(getCancelButton().isEnabled());
   }
 
   /**
@@ -120,8 +113,6 @@ public class UploadServiceChooserActivityTest extends
     assertFalse(getMapsCheckBox().isShown());
     assertFalse(getFusionTablesCheckBox().isShown());
     assertFalse(getDocsCheckBox().isShown());
-    assertFalse(getSendButton().isEnabled());
-    assertTrue(getCancelButton().isEnabled());
   }
 
   /**
@@ -259,35 +250,26 @@ public class UploadServiceChooserActivityTest extends
     uploadServiceChooserActivity = this.getActivity();
   }
 
-  private Button getSendButton() {
-    return (Button) uploadServiceChooserActivity.getDialog()
-        .findViewById(R.id.send_google_send_now);
-  }
-
-  Button getCancelButton() {
-    return (Button) uploadServiceChooserActivity.getDialog().findViewById(R.id.send_google_cancel);
-  }
-
   private CheckBox getMapsCheckBox() {
-    return (CheckBox) uploadServiceChooserActivity.getDialog().findViewById(R.id.send_google_maps);
+    return (CheckBox) uploadServiceChooserActivity.getAlertDialog().findViewById(R.id.send_google_maps);
   }
 
   private CheckBox getFusionTablesCheckBox() {
-    return (CheckBox) uploadServiceChooserActivity.getDialog().findViewById(
+    return (CheckBox) uploadServiceChooserActivity.getAlertDialog().findViewById(
         R.id.send_google_fusion_tables);
   }
 
   private CheckBox getDocsCheckBox() {
-    return (CheckBox) uploadServiceChooserActivity.getDialog().findViewById(R.id.send_google_docs);
+    return (CheckBox) uploadServiceChooserActivity.getAlertDialog().findViewById(R.id.send_google_docs);
   }
 
   private RadioButton getNewMapRadioButton() {
-    return (RadioButton) uploadServiceChooserActivity.getDialog().findViewById(
+    return (RadioButton) uploadServiceChooserActivity.getAlertDialog().findViewById(
         R.id.send_google_new_map);
   }
 
   private RadioButton getExistingMapRadioButton() {
-    return (RadioButton) uploadServiceChooserActivity.getDialog().findViewById(
+    return (RadioButton) uploadServiceChooserActivity.getAlertDialog().findViewById(
         R.id.send_google_existing_map);
   }
 }