From 11e726d23375bf8192bb1e93028f0a1f86ae48d6 Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Mon, 5 Dec 2011 20:19:36 +0900
Subject: [PATCH] Small refactoring to make the next diff smaller

Step 7

Bug: 5306641
Change-Id: If5454679252a54670c501d3a63e9e4bd45028c44
---
 .../UserDictionaryAddWordActivity.java        | 82 +++++++++----------
 1 file changed, 41 insertions(+), 41 deletions(-)

diff --git a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
index 3a05380a667..4b77d054b07 100644
--- a/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
+++ b/src/com/android/settings/inputmethod/UserDictionaryAddWordActivity.java
@@ -83,47 +83,6 @@ public class UserDictionaryAddWordActivity extends Activity {
         finish();
     }
 
-    private static void addLocaleDisplayNameToList(final List<String> list, final String locale) {
-        if (null != locale) {
-            list.add(Utils.createLocaleFromString(locale).getDisplayName());
-        }
-    }
-
-    public void onClickOptions(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);
-
-        final Set<String> locales = UserDictionaryList.getUserDictionaryLocalesList(this);
-        if (null != mLocale && locales.contains(mLocale)) {
-            // Remove our locale if it's in, because we're always gonna put it at the top
-            locales.remove(mLocale);
-        }
-        final String systemLocale = Locale.getDefault().toString();
-        if (null != systemLocale && locales.contains(systemLocale)) {
-            // The system locale should be inside. We want it at the 2nd spot.
-            locales.remove(systemLocale);
-        }
-        final ArrayList<String> localesList = new ArrayList<String>();
-        // Add the passed locale, then the system locale at the top of the list. Add an
-        // "all languages" entry at the bottom of the list.
-        addLocaleDisplayNameToList(localesList, mLocale);
-        addLocaleDisplayNameToList(localesList, systemLocale);
-        for (final String l : locales) {
-            // TODO: sort in unicode order
-            addLocaleDisplayNameToList(localesList, l);
-        }
-        localesList.add(getString(R.string.user_dict_settings_all_languages));
-        final Spinner localeSpinner =
-                (Spinner)findViewById(R.id.user_dictionary_settings_add_dialog_locale);
-        final ArrayAdapter<String> adapter =
-                new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, localesList);
-        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
-        localeSpinner.setAdapter(adapter);
-    }
-
     public void onClickManage(final View v) {
         final Intent intent = new Intent(v.getContext(), UserDictionarySettings.class);
         startActivity(intent);
@@ -164,4 +123,45 @@ public class UserDictionaryAddWordActivity extends Activity {
         }
         finish();
     }
+
+    private static void addLocaleDisplayNameToList(final List<String> list, final String locale) {
+        if (null != locale) {
+            list.add(Utils.createLocaleFromString(locale).getDisplayName());
+        }
+    }
+
+    public void onClickOptions(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);
+
+        final Set<String> locales = UserDictionaryList.getUserDictionaryLocalesList(this);
+        if (null != mLocale && locales.contains(mLocale)) {
+            // Remove our locale if it's in, because we're always gonna put it at the top
+            locales.remove(mLocale);
+        }
+        final String systemLocale = Locale.getDefault().toString();
+        if (null != systemLocale && locales.contains(systemLocale)) {
+            // The system locale should be inside. We want it at the 2nd spot.
+            locales.remove(systemLocale);
+        }
+        final ArrayList<String> localesList = new ArrayList<String>();
+        // Add the passed locale, then the system locale at the top of the list. Add an
+        // "all languages" entry at the bottom of the list.
+        addLocaleDisplayNameToList(localesList, mLocale);
+        addLocaleDisplayNameToList(localesList, systemLocale);
+        for (final String l : locales) {
+            // TODO: sort in unicode order
+            addLocaleDisplayNameToList(localesList, l);
+        }
+        localesList.add(getString(R.string.user_dict_settings_all_languages));
+        final Spinner localeSpinner =
+                (Spinner)findViewById(R.id.user_dictionary_settings_add_dialog_locale);
+        final ArrayAdapter<String> adapter =
+                new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, localesList);
+        adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
+        localeSpinner.setAdapter(adapter);
+    }
 }