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

Commit 29b74a2c authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Merge "Clearer message when face auth fails" into qt-qpr1-dev am:... 

Merge "Merge "Clearer message when face auth fails" into qt-qpr1-dev am: 29899487" into qt-qpr1-dev-plus-aosp
am: b4bb490d

Change-Id: I51e322b399077651ea08c1b3acab1d06eb38ec49
parents 55a5f959 b4bb490d

packages/SystemUI/res/values/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -958,6 +958,9 @@ 
    <!-- Message shown when lock screen is tapped or face authentication fails. [CHAR LIMIT=60] -->

    <string name="keyguard_unlock">Swipe up to open</string>



    <!-- Message shown when face authentication fails and the pin pad is visible. [CHAR LIMIT=60] -->

    <string name="keyguard_retry">Swipe up to try again</string>



    <!-- Text on keyguard screen and in Quick Settings footer indicating that the device is enterprise-managed by a Device Owner [CHAR LIMIT=60] -->

    <string name="do_disclosure_generic">This device is managed by your organization</string>

packages/SystemUI/src/com/android/keyguard/KeyguardUpdateMonitor.java

+0 −5
Original line number Diff line number Diff line
@@ -867,11 +867,6 @@ public class KeyguardUpdateMonitor implements TrustManager.TrustListener { 
                    getCurrentUser());

        }



        // The face timeout message is not very actionable, let's ask the user to

        // manually retry.

        if (msgId == FaceManager.FACE_ERROR_TIMEOUT) {

            errString = mContext.getString(R.string.keyguard_unlock);

        }

        for (int i = 0; i < mCallbacks.size(); i++) {

            KeyguardUpdateMonitorCallback cb = mCallbacks.get(i).get();

            if (cb != null) {

packages/SystemUI/src/com/android/systemui/statusbar/KeyguardIndicationController.java

+7 −3
Original line number Diff line number Diff line
@@ -562,11 +562,11 @@ public class KeyguardIndicationController implements StateListener, 
            return;

        }



        String message = mContext.getString(R.string.keyguard_unlock);

        if (mStatusBarKeyguardViewManager.isBouncerShowing()) {

            String message = mContext.getString(R.string.keyguard_retry);

            mStatusBarKeyguardViewManager.showBouncerMessage(message, mInitialTextColorState);

        } else if (mKeyguardUpdateMonitor.isScreenOn()) {

            showTransientIndication(message);

            showTransientIndication(mContext.getString(R.string.keyguard_unlock));

            hideTransientIndicationDelayed(BaseKeyguardCallback.HIDE_DELAY_MS);

        }

    }
@@ -676,7 +676,11 @@ public class KeyguardIndicationController implements StateListener, 
                return;

            }

            animatePadlockError();

            if (mStatusBarKeyguardViewManager.isBouncerShowing()) {

            if (msgId == FaceManager.FACE_ERROR_TIMEOUT) {

                // The face timeout message is not very actionable, let's ask the user to

                // manually retry.

                showSwipeUpToUnlock();

            } else if (mStatusBarKeyguardViewManager.isBouncerShowing()) {

                mStatusBarKeyguardViewManager.showBouncerMessage(errString, mInitialTextColorState);

            } else if (updateMonitor.isScreenOn()) {

                showTransientIndication(errString);