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

Commit 4c2ef7c1 authored by Tarandeep Singh's avatar Tarandeep Singh Committed by android-build-merger
Browse files

Merge "Replace showSoftInput with ImeAwareEditText.scheduleShowSoftInput" into oc-dr1-dev 

am: fc9622ef

Change-Id: I4390c0d04e56726950b9a404e4d5fe6483d6b9ee
parents 010c9d95 fc9622ef

src/com/android/settings/password/ConfirmLockPassword.java

+4 −3
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import com.android.internal.widget.LockPatternChecker; 
import com.android.internal.widget.LockPatternUtils;

import com.android.internal.widget.TextViewInputDisabler;

import com.android.settings.R;

import com.android.settings.widget.ImeAwareEditText;

import com.android.settingslib.animation.AppearAnimationUtils;

import com.android.settingslib.animation.DisappearAnimationUtils;
@@ -93,7 +94,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
            CredentialCheckResultTracker.Listener {

        private static final long ERROR_MESSAGE_TIMEOUT = 3000;

        private static final String FRAGMENT_TAG_CHECK_LOCK_RESULT = "check_lock_result";

        private TextView mPasswordEntry;

        private ImeAwareEditText mPasswordEntry;

        private TextViewInputDisabler mPasswordEntryInputDisabler;

        private AsyncTask<?, ?, ?> mPendingLockCheck;

        private CredentialCheckResultTracker mCredentialCheckResultTracker;
@@ -132,7 +133,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
                    container,

                    false);



            mPasswordEntry = (TextView) view.findViewById(R.id.password_entry);

            mPasswordEntry = (ImeAwareEditText) view.findViewById(R.id.password_entry);

            mPasswordEntry.setOnEditorActionListener(this);

            // EditText inside ScrollView doesn't automatically get focus.

            mPasswordEntry.requestFocus();
@@ -310,7 +311,7 @@ public class ConfirmLockPassword extends ConfirmDeviceCredentialBaseActivity { 
            mPasswordEntry.setEnabled(true);

            mPasswordEntryInputDisabler.setInputEnabled(true);

            if (shouldAutoShowSoftKeyboard()) {

                mImm.showSoftInput(mPasswordEntry, InputMethodManager.SHOW_IMPLICIT);

                mPasswordEntry.scheduleShowSoftInput();

            }

        }

src/com/android/settings/widget/ScrollToParentEditText.java

+3 −1
Original line number Diff line number Diff line
@@ -23,12 +23,14 @@ import android.view.View; 
import android.view.ViewParent;

import android.widget.EditText;



import com.android.settings.widget.ImeAwareEditText;



/**

 * An EditText that, instead of scrolling to itself when focused, will request scrolling to its

 * parent. This is used in ChooseLockPassword to do make a best effort for not hiding the error

 * messages for why the password is invalid under the keyboard.

 */

public class ScrollToParentEditText extends EditText {

public class ScrollToParentEditText extends ImeAwareEditText {



    private Rect mRect = new Rect();