Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit aead32dc authored by Patrick Gaskin's avatar Patrick Gaskin
Browse files

LatinIME: Support enabling number row for only password inputs

Change-Id: Ie6aeb23ea396bd6342c6a4c12fda917cbc3f1b52
parent 20a85f25
Loading
Loading
Loading
Loading
+4 −0
Original line number Diff line number Diff line
@@ -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>
+6 −0
Original line number Diff line number Diff line
@@ -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"
+2 −1
Original line number Diff line number Diff line
@@ -95,7 +95,8 @@ public final class KeyboardId {
        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)
+6 −0
Original line number Diff line number Diff line
@@ -119,6 +119,7 @@ public final class KeyboardLayoutSet {
        boolean mVoiceInputKeyEnabled;
        boolean mNoSettingsKey;
        boolean mNumberRowEnabled;
        boolean mNumberRowPasswordEnabled; // implied if mNumberRowEnabled
        boolean mLanguageSwitchKeyEnabled;
        boolean mEmojiKeyEnabled;
        RichInputMethodSubtype mSubtype;
@@ -329,6 +330,11 @@ public final class KeyboardLayoutSet {
            return this;
        }

        public Builder setNumberRowPasswordEnabled(final boolean enabled) {
            mParams.mNumberRowPasswordEnabled = enabled;
            return this;
        }

        public Builder setLanguageSwitchKeyEnabled(final boolean enabled) {
            mParams.mLanguageSwitchKeyEnabled = enabled;
            return this;
+1 −0
Original line number Diff line number Diff line
@@ -128,6 +128,7 @@ public final class KeyboardSwitcher implements KeyboardState.SwitchActions {
        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
Loading