commit 5890ae11f1a4b03df43e4263992adeb2f808ab81
author satok <satok@google.com> Wed Nov 03 23:09:40 2010 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Wed Nov 03 23:09:40 2010 -0700
tree b7b492d516625ca1c16b16cd8dc7e73844456ace
parent e8fba33c9c78ddd35a8a59e765d83d05140c02f0
parent 3b075346b14791a60eae23b5176387b734d7c08a

Merge "Updated icons for the input method subtype"

java/res/values/dimens.xml

diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index 765262d..a2ce364 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -25,8 +25,8 @@
     <dimen name="key_horizontal_gap">0.000in</dimen>
     <dimen name="popup_key_height">0.325in</dimen>
     <dimen name="keyboard_bottom_padding">0.06in</dimen>
-    <!-- key_height x 1.6 -->
-    <dimen name="key_preview_height">0.464in</dimen>
+    <!-- key_preview_text_size_large x 2 -->
+    <dimen name="key_preview_height">80sp</dimen>
     <!-- Amount of allowance for selecting keys in a mini popup keyboard by sliding finger. -->
     <!-- popup_key_height x 1.7 -->
     <dimen name="mini_keyboard_slide_allowance">0.553in</dimen>
@@ -35,7 +35,7 @@
 
     <dimen name="key_text_size">0.13in</dimen>
     <dimen name="key_label_text_size">0.083in</dimen>
-    <dimen name="key_preview_text_size_large">0.236in</dimen>
+    <dimen name="key_preview_text_size_large">40sp</dimen>
     <dimen name="key_preview_offset">0.000in</dimen>
     <!-- We use "inch", not "dip" because this value tries dealing with physical distance related
          to user's finger. -->

java/src/com/android/inputmethod/latin/KeyboardSwitcher.java

diff --git a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
index dcbdba1..a79cc2b 100644
--- a/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
+++ b/java/src/com/android/inputmethod/latin/KeyboardSwitcher.java
@@ -162,8 +162,10 @@
     private static final int SETTINGS_KEY_MODE_AUTO = R.string.settings_key_mode_auto;
     private static final int SETTINGS_KEY_MODE_ALWAYS_SHOW =
             R.string.settings_key_mode_always_show;
-    private static final int SETTINGS_KEY_MODE_ALWAYS_HIDE =
-            R.string.settings_key_mode_always_hide;
+    // NOTE: No need to have SETTINGS_KEY_MODE_ALWAYS_HIDE here because it's not being referred to
+    // in the source code now.
+    // Default is SETTINGS_KEY_MODE_AUTO.
+    private static final int DEFAULT_SETTINGS_KEY_MODE = SETTINGS_KEY_MODE_AUTO;
 
     private int mLastDisplayWidth;
     private LanguageSwitcher mLanguageSwitcher;
@@ -546,18 +548,18 @@
         Resources resources = mInputMethodService.getResources();
         final boolean showSettingsKeyOption = resources.getBoolean(
                 R.bool.config_enable_show_settings_key_option);
-        final int defaultSettingsKeyMode = showSettingsKeyOption
-                ? SETTINGS_KEY_MODE_AUTO : SETTINGS_KEY_MODE_ALWAYS_HIDE;
-        final String settingsKeyMode = prefs.getString(LatinIMESettings.PREF_SETTINGS_KEY,
-                resources.getString(defaultSettingsKeyMode));
-        // We show the settings key when 1) SETTINGS_KEY_MODE_ALWAYS_SHOW or
-        // 2) SETTINGS_KEY_MODE_AUTO and there are two or more enabled IMEs on the system
-        if (settingsKeyMode.equals(resources.getString(SETTINGS_KEY_MODE_ALWAYS_SHOW))
-                || (settingsKeyMode.equals(resources.getString(SETTINGS_KEY_MODE_AUTO))
-                        && LatinIMEUtil.hasMultipleEnabledIMEs(mInputMethodService))) {
-            mHasSettingsKey = true;
-        } else {
-            mHasSettingsKey = false;
+        if (showSettingsKeyOption) {
+            final String settingsKeyMode = prefs.getString(LatinIMESettings.PREF_SETTINGS_KEY,
+                    resources.getString(DEFAULT_SETTINGS_KEY_MODE));
+            // We show the settings key when 1) SETTINGS_KEY_MODE_ALWAYS_SHOW or
+            // 2) SETTINGS_KEY_MODE_AUTO and there are two or more enabled IMEs on the system
+            if (settingsKeyMode.equals(resources.getString(SETTINGS_KEY_MODE_ALWAYS_SHOW))
+                    || (settingsKeyMode.equals(resources.getString(SETTINGS_KEY_MODE_AUTO))
+                            && LatinIMEUtil.hasMultipleEnabledIMEs(mInputMethodService))) {
+                mHasSettingsKey = true;
+                return;
+            }
         }
+        mHasSettingsKey = false;
     }
 }