From a012943119c17795fa0ac0f6f398af5886f07450 Mon Sep 17 00:00:00 2001
From: Jimmy Shih <jshih@google.com>
Date: Mon, 24 Oct 2011 14:30:33 -0700
Subject: [PATCH] - When there are two buttons, place the positive button on
 the left and the negative button on the right to match the alert dialog. - If
 an alert dialog only needs one button, assign it as the PostiveButton. - If
 an alert dialog needs two buttons, assign one Positive and another Negative.
 - for CheckUnits, change the message to   "Do you want to use metrics as your
 default units?" so that   "yes" corresponds to the default case of using
 metrics as   the default units.

---
 MyTracks/res/layout/chart_settings.xml                 | 10 +++++-----
 MyTracks/res/layout/mytracks_detail.xml                | 10 +++++-----
 MyTracks/res/layout/mytracks_send_to_google.xml        | 10 +++++-----
 MyTracks/res/layout/mytracks_waypoint_details.xml      | 10 +++++-----
 MyTracks/res/layout/welcome.xml                        |  8 ++++----
 MyTracks/res/values-ca/strings.xml                     |  1 -
 MyTracks/res/values-de/strings.xml                     |  1 -
 MyTracks/res/values-es/strings.xml                     |  1 -
 MyTracks/res/values-fi/strings.xml                     |  1 -
 MyTracks/res/values-fr/strings.xml                     |  3 +--
 MyTracks/res/values-ja/strings.xml                     |  1 -
 MyTracks/res/values-pl/strings.xml                     |  1 -
 MyTracks/res/values-ru/strings.xml                     |  3 +--
 MyTracks/res/values-sv/strings.xml                     |  1 -
 MyTracks/res/values-zh-rCN/strings.xml                 |  1 -
 MyTracks/res/values/strings.xml                        |  3 +--
 .../google/android/apps/mytracks/AccountChooser.java   |  2 +-
 .../com/google/android/apps/mytracks/CheckUnits.java   |  6 +++---
 .../google/android/apps/mytracks/WelcomeActivity.java  |  4 ++--
 .../android/apps/mytracks/io/file/ImportActivity.java  |  4 ++--
 .../android/apps/mytracks/io/file/SaveActivity.java    |  2 +-
 .../mytracks/io/sendtogoogle/ResultDialogFactory.java  |  2 +-
 22 files changed, 37 insertions(+), 48 deletions(-)

diff --git a/MyTracks/res/layout/chart_settings.xml b/MyTracks/res/layout/chart_settings.xml
index fb57fefd7..a44e75071 100644
--- a/MyTracks/res/layout/chart_settings.xml
+++ b/MyTracks/res/layout/chart_settings.xml
@@ -124,14 +124,14 @@ limitations under the License.
   </ScrollView>
   <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
-    <Button android:id="@+id/chart_settings_cancel"
-      android:layout_gravity="left"
-      android:text="@string/cancel"
-      style="@style/Button"/>
     <Button android:id="@+id/chart_settings_ok"
-      android:layout_gravity="right"
+      android:layout_gravity="left"
       android:text="@string/ok"
       style="@style/Button"/>
+    <Button android:id="@+id/chart_settings_cancel"
+      android:layout_gravity="right"
+      android:text="@string/cancel"
+      style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_detail.xml b/MyTracks/res/layout/mytracks_detail.xml
index f950d1408..db3023d8f 100644
--- a/MyTracks/res/layout/mytracks_detail.xml
+++ b/MyTracks/res/layout/mytracks_detail.xml
@@ -70,14 +70,14 @@ limitations under the License.
     android:imeOptions="actionDone"/>
   <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
-    <Button android:id="@+id/trackdetails_cancel"
-      android:layout_gravity="left"
-      android:text="@string/cancel"
-      style="@style/Button"/>
     <Button android:id="@+id/trackdetails_save"
-      android:layout_gravity="right"
+      android:layout_gravity="left"
       android:text="@string/save"
       style="@style/Button"/>
+    <Button android:id="@+id/trackdetails_cancel"
+      android:layout_gravity="right"
+      android:text="@string/cancel"
+      style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_send_to_google.xml b/MyTracks/res/layout/mytracks_send_to_google.xml
index 5d101b7fe..726f515f0 100644
--- a/MyTracks/res/layout/mytracks_send_to_google.xml
+++ b/MyTracks/res/layout/mytracks_send_to_google.xml
@@ -128,14 +128,14 @@ limitations under the License.
   </ScrollView>
   <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
-    <Button android:id="@+id/sendtogoogle_cancel"
-      android:layout_gravity="left"
-      android:text="@string/cancel"
-      style="@style/Button"/>
     <Button android:id="@+id/sendtogoogle_send_now"
-      android:layout_gravity="right"
+      android:layout_gravity="left"
       android:text="@string/sendtogoogle_send_now"
       style="@style/Button"/>
+    <Button android:id="@+id/sendtogoogle_cancel"
+      android:layout_gravity="right"
+      android:text="@string/cancel"
+      style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/MyTracks/res/layout/mytracks_waypoint_details.xml b/MyTracks/res/layout/mytracks_waypoint_details.xml
index 04faf8833..bb683f23f 100644
--- a/MyTracks/res/layout/mytracks_waypoint_details.xml
+++ b/MyTracks/res/layout/mytracks_waypoint_details.xml
@@ -489,14 +489,14 @@ limitations under the License.
   </ScrollView>
   <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
-    <Button android:id="@+id/waypointdetails_cancel"
-      android:layout_gravity="left"
-      android:text="@string/cancel"
-      style="@style/Button"/>
     <Button android:id="@+id/waypointdetails_save"
-      android:layout_gravity="right"
+      android:layout_gravity="left"
       android:text="@string/save"
       style="@style/Button"/>
+    <Button android:id="@+id/waypointdetails_cancel"
+      android:layout_gravity="right"
+      android:text="@string/cancel"
+      style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
 </LinearLayout>
diff --git a/MyTracks/res/layout/welcome.xml b/MyTracks/res/layout/welcome.xml
index 201ad459f..8bbb46444 100644
--- a/MyTracks/res/layout/welcome.xml
+++ b/MyTracks/res/layout/welcome.xml
@@ -26,13 +26,13 @@ limitations under the License.
     android:layout_weight="1" />
   <LinearLayout style="@style/ButtonLayout">
     <LinearLayout style="@style/ButtonSpacer"/>
-    <Button android:id="@+id/welcome_about"
+    <Button android:id="@+id/welcome_ok"
       android:layout_gravity="left"
-      android:text="@string/welcome_about"
+      android:text="@string/ok"
       style="@style/Button"/>
-    <Button android:id="@+id/welcome_read_later"
+    <Button android:id="@+id/welcome_about"
       android:layout_gravity="right"
-      android:text="@string/welcome_read_later"
+      android:text="@string/welcome_about"
       style="@style/Button"/>
     <LinearLayout style="@style/ButtonSpacer"/>
   </LinearLayout>
diff --git a/MyTracks/res/values-ca/strings.xml b/MyTracks/res/values-ca/strings.xml
index a0fd048a5..c7ed91c42 100644
--- a/MyTracks/res/values-ca/strings.xml
+++ b/MyTracks/res/values-ca/strings.xml
@@ -388,7 +388,6 @@ limitations under the License.
 
   <!-- Check Units -->
   <string name="check_units_title">Avís de les unitats de mesura</string>
-  <string name="check_units_message">Les unitats són mètriques per defecte. Voleu canviar aquest paràmetre?</string>
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="bluetooth_options">Opcions del Bluetooth</string>
diff --git a/MyTracks/res/values-de/strings.xml b/MyTracks/res/values-de/strings.xml
index 4d8e28ac8..386872595 100644
--- a/MyTracks/res/values-de/strings.xml
+++ b/MyTracks/res/values-de/strings.xml
@@ -419,7 +419,6 @@ limitations under the License.
 
   <!-- Check Units -->
   <string name="check_units_title">Einheitenbenachrichtigung</string>
-  <string name="check_units_message">Voreingestellt sind metrische Einheiten. Willst Du diese Einstellung ändern?</string>
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
diff --git a/MyTracks/res/values-es/strings.xml b/MyTracks/res/values-es/strings.xml
index 719171476..9784f4e58 100644
--- a/MyTracks/res/values-es/strings.xml
+++ b/MyTracks/res/values-es/strings.xml
@@ -475,7 +475,6 @@ limitations under the License.
 
   <!-- Check Units -->
   <string name="check_units_title">Aviso de unidades de medida</string>
-  <string name="check_units_message">Por defecto las unidades son métricas. ¿Quiere cambiar la configuración?</string>
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="bluetooth_options">Opciones Bluetooth</string>
diff --git a/MyTracks/res/values-fi/strings.xml b/MyTracks/res/values-fi/strings.xml
index 07a465c0d..a47e2378b 100644
--- a/MyTracks/res/values-fi/strings.xml
+++ b/MyTracks/res/values-fi/strings.xml
@@ -471,7 +471,6 @@ limitations under the License.
 
   <!-- Check Units -->
   <string name="check_units_title">Huomautus mittayksiköistä</string>
-  <string name="check_units_message">Oletuksena käytössä on metrijärjestelmä. Haluatko muuttaa asetuksen?</string>
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
diff --git a/MyTracks/res/values-fr/strings.xml b/MyTracks/res/values-fr/strings.xml
index 3a533a7f5..4229d1a66 100644
--- a/MyTracks/res/values-fr/strings.xml
+++ b/MyTracks/res/values-fr/strings.xml
@@ -375,8 +375,7 @@ limitations under the License.
 
   <!-- Check Units -->
   <string name="check_units_title">Note sur les unités de mesure</string>
-  <string name="check_units_message">Le système métrique est utilisé par défaut. Souhaitez-vous changer ce paramètre ?</string>
-
+ 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
   <string name="bluetooth_options">Options Bluetooth</string>
diff --git a/MyTracks/res/values-ja/strings.xml b/MyTracks/res/values-ja/strings.xml
index b9e5daa5f..36cc5e415 100644
--- a/MyTracks/res/values-ja/strings.xml
+++ b/MyTracks/res/values-ja/strings.xml
@@ -441,7 +441,6 @@ limitations under the License.
 
   <!-- Check Units -->
   <string name="check_units_title">計測単位についてのご注意</string>
-  <string name="check_units_message">デフォルトの単位はメートルです．設定を変更しますか?</string>
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="bluetooth_options">Bluetoothオプション</string>
diff --git a/MyTracks/res/values-pl/strings.xml b/MyTracks/res/values-pl/strings.xml
index f83d9c0f1..55a503a3e 100644
--- a/MyTracks/res/values-pl/strings.xml
+++ b/MyTracks/res/values-pl/strings.xml
@@ -389,7 +389,6 @@ limitations under the License.
 
   <!-- Check Units -->
   <string name="check_units_title">Jednostki miary</string>
-  <string name="check_units_message">Domyślnie używane są jednostki metryczne. Chcesz to zmienić?</string>
   
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
diff --git a/MyTracks/res/values-ru/strings.xml b/MyTracks/res/values-ru/strings.xml
index a48596e59..3d301605d 100644
--- a/MyTracks/res/values-ru/strings.xml
+++ b/MyTracks/res/values-ru/strings.xml
@@ -467,8 +467,7 @@ limitations under the License.
 
   <!-- Check Units -->
   <string name="check_units_title">Единицы измерения обратите внимание</string>
-  <string name="check_units_message">По умолчанию используются метрические единицы. Вы хотели бы изменить этот параметр?</string>
-
+ 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
   <string name="bluetooth_options">Параметры Bluetooth</string>
diff --git a/MyTracks/res/values-sv/strings.xml b/MyTracks/res/values-sv/strings.xml
index e3a3ffbe0..e50bbaf50 100644
--- a/MyTracks/res/values-sv/strings.xml
+++ b/MyTracks/res/values-sv/strings.xml
@@ -362,5 +362,4 @@ limitations under the License.
 
   <!-- Check Units -->
   <string name="check_units_title">Mätenheter</string>
-  <string name="check_units_message">Som standard är enheterna metriska. Vill du ändra den inställningen?</string>
 </resources>
diff --git a/MyTracks/res/values-zh-rCN/strings.xml b/MyTracks/res/values-zh-rCN/strings.xml
index e15de3822..cd9ede1a2 100644
--- a/MyTracks/res/values-zh-rCN/strings.xml
+++ b/MyTracks/res/values-zh-rCN/strings.xml
@@ -449,7 +449,6 @@ limitations under the License.
 
   <!-- Check Units -->
   <string name="check_units_title">测量单位提示</string>
-  <string name="check_units_message">默认单位均为公制. 你想要修改此设置吗?</string>
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">蓝牙</string>
diff --git a/MyTracks/res/values/strings.xml b/MyTracks/res/values/strings.xml
index ba96566d0..80a8e7934 100644
--- a/MyTracks/res/values/strings.xml
+++ b/MyTracks/res/values/strings.xml
@@ -513,7 +513,6 @@ limitations under the License.
 
   <!-- Welcome -->
   <string name="welcome">Welcome</string>
-  <string name="welcome_read_later">Ok</string>
   <string name="welcome_about">About My Tracks</string>
 
   <!-- Announcement -->
@@ -530,7 +529,7 @@ limitations under the License.
 
   <!-- Check Units -->
   <string name="check_units_title">Units of Measure Notice</string>
-  <string name="check_units_message">By default units are metric. Would you like to change that setting?</string>
+  <string name="check_units_message">Do you want to use metrics as your default units?</string>
 
   <!-- Fake preference keys - never saved, but show options in the preferences screen -->
   <string name="method_bluetooth">Bluetooth</string>
diff --git a/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java b/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
index 11b3d19c2..69d0aaa7d 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/AccountChooser.java
@@ -127,7 +127,7 @@ public class AccountChooser {
     builder.setTitle(R.string.no_account_found_title);
     builder.setMessage(R.string.no_account_found);
     builder.setCancelable(true);
-    builder.setNegativeButton(R.string.ok,
+    builder.setPositiveButton(R.string.ok,
         new DialogInterface.OnClickListener() {
           public void onClick(DialogInterface dialog, int which) {
             dialog.dismiss();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java b/MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java
index 355418599..104242f75 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/CheckUnits.java
@@ -60,12 +60,12 @@ class CheckUnits {
     builder.setCancelable(true);
     builder.setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
-        accept(context, preferences);
+        recordCheckPerformed(preferences);
       }
     });
     builder.setNegativeButton(R.string.no, new DialogInterface.OnClickListener() {
       public void onClick(DialogInterface dialog, int which) {
-        recordCheckPerformed(preferences);
+        changeDefaultUnits(context, preferences);
       }
     });
     builder.setOnCancelListener(new DialogInterface.OnCancelListener() {
@@ -77,7 +77,7 @@ class CheckUnits {
     builder.show();
   }
 
-  private static void accept(Context context, SharedPreferences preferences) {
+  private static void changeDefaultUnits(Context context, SharedPreferences preferences) {
     recordCheckPerformed(preferences);
     Intent startIntent = new Intent(context, SettingsActivity.class);
     startIntent.putExtra(context.getString(R.string.open_settings_screen), 
diff --git a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
index 113253c5c..91b5eef13 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/WelcomeActivity.java
@@ -47,7 +47,7 @@ public class WelcomeActivity extends Activity {
     WebView web = (WebView) findViewById(R.id.welcome_web);
     web.loadUrl("file:///android_asset/welcome.html");
 
-    findViewById(R.id.welcome_read_later).setOnClickListener(
+    findViewById(R.id.welcome_ok).setOnClickListener(
         new OnClickListener() {
           public void onClick(View v) {
             finish();
@@ -72,7 +72,7 @@ public class WelcomeActivity extends Activity {
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setView(view);
     builder.setPositiveButton(R.string.ok, null);
-    builder.setNeutralButton(R.string.license, new DialogInterface.OnClickListener() {
+    builder.setNegativeButton(R.string.license, new DialogInterface.OnClickListener() {
       @Override 
       public void onClick(DialogInterface dialog, int which) {
         Eula.showEula(WelcomeActivity.this);
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
index 1ca2b8061..29811a3b1 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/ImportActivity.java
@@ -104,7 +104,7 @@ public class ImportActivity extends Activity {
             finish();
           }
         });
-        dialogBuilder.setNeutralButton(R.string.import_show_track, new OnClickListener() {
+        dialogBuilder.setNegativeButton(R.string.import_show_track, new OnClickListener() {
           @Override
           public void onClick(DialogInterface arg0, int arg1) {
             showImportedTrack();
@@ -114,7 +114,7 @@ public class ImportActivity extends Activity {
         return dialogBuilder.create();
       case FAILURE_DIALOG:
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setNeutralButton(R.string.ok, new OnClickListener() {
+        builder.setPositiveButton(R.string.ok, new OnClickListener() {
           @Override
           public void onClick(DialogInterface arg0, int arg1) {
             finish();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
index 818dcbdd2..b788039d0 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/file/SaveActivity.java
@@ -168,7 +168,7 @@ public class SaveActivity extends Activity {
 
     AlertDialog.Builder builder = new AlertDialog.Builder(this);
     builder.setMessage(writer.getErrorMessage());
-    builder.setNeutralButton(R.string.ok, new OnClickListener() {
+    builder.setPositiveButton(R.string.ok, new OnClickListener() {
       @Override
       public void onClick(DialogInterface dialog, int arg1) {
         dialog.dismiss();
diff --git a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
index 544d3aee0..8d774da00 100644
--- a/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
+++ b/MyTracks/src/com/google/android/apps/mytracks/io/sendtogoogle/ResultDialogFactory.java
@@ -81,7 +81,7 @@ public class ResultDialogFactory {
 
     builder.setPositiveButton(activity.getString(R.string.ok), onOkClickListener);
     if (onShareClickListener != null) {
-      builder.setNeutralButton(activity.getString(R.string.share_track),
+      builder.setNegativeButton(activity.getString(R.string.share_track),
           onShareClickListener);
     }