LatinIME: Support enabling number row for only password inputs

Change-Id: Ie6aeb23ea396bd6342c6a4c12fda917cbc3f1b52

Author: pgaskin

java/res/values/cm_strings.xml

@@ -36,6 +36,10 @@ disposition rather than other common dispositions for Latin languages. [CHAR LIM
     <string name="number_row">Number row</string>
     <string name="number_row_summary">Always show a number row for all layouts that feature 4 rows of keys</string>
 
+    <!-- Preference item for enabling the number row on password inputs -->
+    <string name="number_row_password">Number row for passwords</string>
+    <string name="number_row_password_summary">Always show a number row for all layouts that feature 4 rows of keys for password input</string>
+
     <!-- Preference item for the space bar track pad -->
     <string name="space_trackpad">Space bar trackpad</string>
     <string name="space_trackpad_summary">Swipe on the spacebar to move the cursor</string>

java/res/xml/prefs_screen_preferences.xml

@@ -30,6 +30,12 @@
         android:summary="@string/number_row_summary"
         android:defaultValue="false"
         android:persistent="true" />
+    <CheckBoxPreference
+        android:key="pref_show_number_row_password"
+        android:title="@string/number_row_password"
+        android:summary="@string/number_row_password_summary"
+        android:defaultValue="false"
+        android:persistent="true" />
     <CheckBoxPreference
         android:key="pref_show_emoji_key"
         android:title="@string/show_emoji_key"

java/src/com/android/inputmethod/keyboard/KeyboardId.java

@@ -95,7 +95,8 @@ public KeyboardId(final int elementId, final KeyboardLayoutSet.Params params) {
         mElementId = elementId;
         mEditorInfo = params.mEditorInfo;
         mClobberSettingsKey = params.mNoSettingsKey;
-        mNumberRowEnabled = params.mNumberRowEnabled;
+        mNumberRowEnabled = params.mNumberRowEnabled ||
+                (params.mNumberRowPasswordEnabled && params.mIsPasswordField);
         mLanguageSwitchKeyEnabled = params.mLanguageSwitchKeyEnabled;
         mEmojiKeyEnabled = params.mEmojiKeyEnabled;
         mCustomActionLabel = (mEditorInfo.actionLabel != null)

java/src/com/android/inputmethod/keyboard/KeyboardLayoutSet.java

@@ -119,6 +119,7 @@ public static final class Params {
         boolean mVoiceInputKeyEnabled;
         boolean mNoSettingsKey;
         boolean mNumberRowEnabled;
+        boolean mNumberRowPasswordEnabled; // implied if mNumberRowEnabled
         boolean mLanguageSwitchKeyEnabled;
         boolean mEmojiKeyEnabled;
         RichInputMethodSubtype mSubtype;
@@ -329,6 +330,11 @@ public Builder setNumberRowEnabled(final boolean enabled) {
             return this;
         }
 
+        public Builder setNumberRowPasswordEnabled(final boolean enabled) {
+            mParams.mNumberRowPasswordEnabled = enabled;
+            return this;
+        }
+
         public Builder setLanguageSwitchKeyEnabled(final boolean enabled) {
             mParams.mLanguageSwitchKeyEnabled = enabled;
             return this;

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

@@ -128,6 +128,7 @@ public void loadKeyboard(final EditorInfo editorInfo, final SettingsValues setti
         builder.setSubtype(mRichImm.getCurrentSubtype());
         builder.setVoiceInputKeyEnabled(settingsValues.mShowsVoiceInputKey);
         builder.setNumberRowEnabled(settingsValues.mShowNumberRow);
+        builder.setNumberRowPasswordEnabled(settingsValues.mShowNumberRowPassword);
         builder.setLanguageSwitchKeyEnabled(mLatinIME.shouldShowLanguageSwitchKey());
         builder.setEmojiKeyEnabled(settingsValues.mShowsEmojiKey);
         builder.setSplitLayoutEnabledByUser(ProductionFlags.IS_SPLIT_KEYBOARD_SUPPORTED

java/src/com/android/inputmethod/latin/settings/PreferencesSettingsFragment.java

@@ -95,6 +95,10 @@ public void onSharedPreferenceChanged(final SharedPreferences prefs, final Strin
             setPreferenceEnabled(Settings.PREF_KEY_PREVIEW_POPUP_DISMISS_DELAY,
                     Settings.readKeyPreviewPopupEnabled(prefs, res));
         }
+        if (key.equals(Settings.PREF_SHOW_NUMBER_ROW)) {
+            setPreferenceEnabled(Settings.PREF_SHOW_NUMBER_ROW_PASSWORD,
+                    !Settings.readShowNumberRow(prefs));
+        }
         refreshEnablingsOfKeypressSoundAndVibrationSettings();
     }
 

java/src/com/android/inputmethod/latin/settings/Settings.java

@@ -104,6 +104,7 @@ public final class Settings implements SharedPreferences.OnSharedPreferenceChang
 
     public static final String PREF_ENABLE_METRICS_LOGGING = "pref_enable_metrics_logging";
     public static final String PREF_SHOW_NUMBER_ROW = "pref_show_number_row";
+    public static final String PREF_SHOW_NUMBER_ROW_PASSWORD = "pref_show_number_row_password";
 
     public static final String PREF_SHOW_LONGPRESS_HINTS = "pref_show_longpress_hints";
     // This preference key is deprecated. Use {@link #PREF_SHOW_LANGUAGE_SWITCH_KEY} instead.

java/src/com/android/inputmethod/latin/settings/SettingsValues.java

@@ -68,6 +68,7 @@ public class SettingsValues {
     public final boolean mKeyPreviewPopupOn;
     public final boolean mShowsVoiceInputKey;
     public final boolean mShowNumberRow;
+    public final boolean mShowNumberRowPassword;
     public final boolean mShowLongpressHints;
     public final boolean mIncludesOtherImesInLanguageSwitchList;
     public final boolean mShowsLanguageSwitchKey;
@@ -145,6 +146,7 @@ public SettingsValues(final Context context, final SharedPreferences prefs, fina
                 && mInputAttributes.mShouldShowVoiceInputKey
                 && Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN;
         mShowNumberRow = prefs.getBoolean(Settings.PREF_SHOW_NUMBER_ROW, false);
+        mShowNumberRowPassword = prefs.getBoolean(Settings.PREF_SHOW_NUMBER_ROW_PASSWORD, false);
         mShowLongpressHints = prefs.getBoolean(Settings.PREF_SHOW_LONGPRESS_HINTS, true);
         mIncludesOtherImesInLanguageSwitchList = Settings.ENABLE_SHOW_LANGUAGE_SWITCH_KEY_SETTINGS
                 ? prefs.getBoolean(Settings.PREF_INCLUDE_OTHER_IMES_IN_LANGUAGE_SWITCH_LIST, false)