From 2c892d900b310ef62892a5e9f2b4fbc59010e54e Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Fri, 16 Dec 2011 18:31:48 +0900
Subject: [PATCH] Change the "manage dictionaries" button to "less options"

This is supposed to be easier to understand for users.

Change-Id: I144031941712ab15fb490619c288d533ce884ee9
---
 res/layout/user_dictionary_add_word.xml       | 12 +++++-----
 res/values/strings.xml                        |  6 ++---
 .../UserDictionaryAddWordActivity.java        | 24 ++++++++++++-------
 3 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/res/layout/user_dictionary_add_word.xml b/res/layout/user_dictionary_add_word.xml
index 1e6b5ac9bf1..26cfd6853ec 100644
--- a/res/layout/user_dictionary_add_word.xml
+++ b/res/layout/user_dictionary_add_word.xml
@@ -99,27 +99,27 @@
               android:text="@string/cancel"
               android:layout_height="wrap_content"
               android:onClick="onClickCancel" />
-      <Button android:id="@+id/user_dictionary_settings_add_dialog_options"
+      <Button android:id="@+id/user_dictionary_settings_add_dialog_more_options"
               android:layout_width="0dip"
               android:layout_gravity="center_horizontal"
               android:layout_weight="1"
               android:maxLines="2"
               style="?android:attr/buttonBarButtonStyle"
               android:textSize="14sp"
-              android:text="@string/user_dict_settings_add_dialog_options"
+              android:text="@string/user_dict_settings_add_dialog_more_options"
               android:layout_height="wrap_content"
-              android:onClick="onClickOptions" />
-      <Button android:id="@+id/user_dictionary_settings_add_dialog_manage"
+              android:onClick="onClickMoreOptions" />
+      <Button android:id="@+id/user_dictionary_settings_add_dialog_less_options"
               android:layout_width="0dip"
               android:layout_gravity="center_horizontal"
               android:layout_weight="1"
               android:maxLines="2"
               style="?android:attr/buttonBarButtonStyle"
               android:textSize="14sp"
-              android:text="@string/user_dict_settings_add_dialog_manage"
+              android:text="@string/user_dict_settings_add_dialog_less_options"
               android:layout_height="wrap_content"
               android:visibility="gone"
-              android:onClick="onClickManage" />
+              android:onClick="onClickLessOptions" />
       <Button android:layout_width="0dip"
               android:layout_gravity="right"
               android:layout_weight="1"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 903dc8cbd25..0eb606f3cf0 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -2602,9 +2602,9 @@
     <!-- User dictionary settings. The title of the dialog to add a new word to the user dictionary. [CHAR LIMIT=25] -->
     <string name="user_dict_settings_add_dialog_title">Add to dictionary</string>
     <!-- User dictionary settings. Text on the dialog button to pop more options for adding a word. [CHAR LIMIT=15] -->
-    <string name="user_dict_settings_add_dialog_options">Options</string>
-    <!-- User dictionary settings. Text on the dialog button to show the full user dictionary interface. [CHAR LIMIT=15] -->
-    <string name="user_dict_settings_add_dialog_manage">Manage entries</string>
+    <string name="user_dict_settings_add_dialog_more_options">More options</string>
+    <!-- User dictionary settings. Text on the dialog button mask advanced options. [CHAR LIMIT=15] -->
+    <string name="user_dict_settings_add_dialog_less_options">Less options</string>
     <!-- User dictionary settings. Text on the dialog button to confirm adding a word. [CHAR LIMIT=15] -->
     <string name="user_dict_settings_add_dialog_confirm">OK</string>
     <!-- User dictionary settings. Label to put before the shortcut field (once a shortcut is registered, the user can type the shortcut and get the word it points to in the suggestions). [CHAR LIMIT=25] -->
diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
index 6ab6a5060d1..17c986a56de 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -88,12 +88,6 @@ public class UserDictionaryAddWordActivity extends Activity
         finish();
     }
 
-    public void onClickManage(final View v) {
-        final Intent intent = new Intent(v.getContext(), UserDictionarySettings.class);
-        startActivity(intent);
-        finish();
-    }
-
     public void onClickConfirm(final View v) {
         if (MODE_EDIT == mMode && !TextUtils.isEmpty(mOldWord)) {
             UserDictionarySettings.deleteWord(mOldWord, this.getContentResolver());
@@ -154,12 +148,14 @@ public class UserDictionaryAddWordActivity extends Activity
         }
     }
 
-    public void onClickOptions(final View v) {
+    public void onClickMoreOptions(final View v) {
         final View moreOptionsView =
                 findViewById(R.id.user_dict_settings_add_dialog_shortcut_interface);
         moreOptionsView.setVisibility(View.VISIBLE);
-        findViewById(R.id.user_dictionary_settings_add_dialog_options).setVisibility(View.GONE);
-        findViewById(R.id.user_dictionary_settings_add_dialog_manage).setVisibility(View.VISIBLE);
+        findViewById(R.id.user_dictionary_settings_add_dialog_more_options)
+                .setVisibility(View.GONE);
+        findViewById(R.id.user_dictionary_settings_add_dialog_less_options)
+                .setVisibility(View.VISIBLE);
 
         final Set<String> locales = UserDictionaryList.getUserDictionaryLocalesList(this);
         // Remove our locale if it's in, because we're always gonna put it at the top
@@ -190,6 +186,16 @@ public class UserDictionaryAddWordActivity extends Activity
         localeSpinner.setOnItemSelectedListener(this);
     }
 
+    public void onClickLessOptions(final View v) {
+        final View moreOptionsView =
+                findViewById(R.id.user_dict_settings_add_dialog_shortcut_interface);
+        moreOptionsView.setVisibility(View.GONE);
+        findViewById(R.id.user_dictionary_settings_add_dialog_more_options)
+                .setVisibility(View.VISIBLE);
+        findViewById(R.id.user_dictionary_settings_add_dialog_less_options)
+                .setVisibility(View.GONE);
+    }
+
     @Override
     public void onItemSelected(final AdapterView<?> parent, final View view, final int pos,
             final long id) {