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

Commit 8f5a3842 authored by Tadashi G. Takaoka's avatar Tadashi G. Takaoka Committed by Android (Google) Code Review
Browse files

Merge "Disable showing TAB key when navigate flags are specified"

parents c78278bf f0f72646

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

+6 −5
Original line number Diff line number Diff line
@@ -16,12 +16,12 @@ 


package com.android.inputmethod.keyboard;



import android.view.inputmethod.EditorInfo;



import com.android.inputmethod.compat.EditorInfoCompatUtils;

import com.android.inputmethod.compat.InputTypeCompatUtils;

import com.android.inputmethod.latin.R;



import android.view.inputmethod.EditorInfo;



import java.util.Arrays;

import java.util.Locale;
@@ -67,9 +67,10 @@ public class KeyboardId { 
        this.mMode = mode;

        this.mXmlId = xmlId;

        this.mColorScheme = colorScheme;

        this.mNavigateAction = InputTypeCompatUtils.isWebInputType(inputType)

                || EditorInfoCompatUtils.hasFlagNavigateNext(imeOptions)

                || EditorInfoCompatUtils.hasFlagNavigatePrevious(imeOptions);

        // Note: Turn off checking navigation flag to show TAB key for now.

        this.mNavigateAction = InputTypeCompatUtils.isWebInputType(inputType);

//                || EditorInfoCompatUtils.hasFlagNavigateNext(imeOptions)

//                || EditorInfoCompatUtils.hasFlagNavigatePrevious(imeOptions);

        this.mPasswordInput = InputTypeCompatUtils.isPasswordInputType(inputType)

                || InputTypeCompatUtils.isVisiblePasswordInputType(inputType);

        this.mHasSettingsKey = hasSettingsKey;

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

+3 −2
Original line number Diff line number Diff line
@@ -518,8 +518,9 @@ public class LatinIME extends InputMethodServiceCompatWrapper implements Keyboar 
        LatinKeyboardView inputView = switcher.getKeyboardView();



        if (DEBUG) {

            Log.d(TAG, "onStartInputView: inputType=" + ((attribute == null) ? "none"

                    : String.format("0x%08x", attribute.inputType)));

            Log.d(TAG, "onStartInputView: attribute:" + ((attribute == null) ? "none"

                    : String.format("inputType=0x%08x imeOptions=0x%08x",

                            attribute.inputType, attribute.imeOptions)));

        }

        // In landscape mode, this method gets called without the input view being created.

        if (inputView == null) {