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

Commit b7529649 authored by Bingyu Zhang's avatar Bingyu Zhang Committed by android-build-merger
Browse files

Merge "Accessibility change when Trusted Face icon shows." into pi-dev am: 3e169cac 

am: 7335dc49

Change-Id: Ice6f77fef237cfab5a2152c05563221983756abe
parents f2b4f462 7335dc49

packages/SystemUI/res/values/strings.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -240,6 +240,8 @@ 
    <string name="accessibility_waiting_for_fingerprint">Waiting for fingerprint</string>

    <string name="accessibility_waiting_for_fingerprint">Waiting for fingerprint</string>

    <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->

    <!-- Accessibility action of the unlock button when fingerpint is on (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_unlock_without_fingerprint">Unlock without using your fingerprint</string>

    <string name="accessibility_unlock_without_fingerprint">Unlock without using your fingerprint</string>

    <!-- Content description of the Trusted Face icon for accessibility. [CHAR LIMIT=NONE] -->

    <string name="accessibility_scanning_face">Scanning face</string>

    <!-- Click action label for accessibility for the smart reply buttons (not shown on-screen).". [CHAR LIMIT=NONE] -->

    <!-- Click action label for accessibility for the smart reply buttons (not shown on-screen).". [CHAR LIMIT=NONE] -->

    <string name="accessibility_send_smart_reply">Send</string>

    <string name="accessibility_send_smart_reply">Send</string>

    <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->

    <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/statusbar/phone/LockIcon.java

+12 −0
Original line number Original line Diff line number Diff line
@@ -55,6 +55,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
    private final UnlockMethodCache mUnlockMethodCache;

    private final UnlockMethodCache mUnlockMethodCache;

    private AccessibilityController mAccessibilityController;

    private AccessibilityController mAccessibilityController;

    private boolean mHasFingerPrintIcon;

    private boolean mHasFingerPrintIcon;

    private boolean mHasFaceUnlockIcon;

    private int mDensity;

    private int mDensity;





    private final Runnable mDrawOffTimeout = () -> update(true /* forceUpdate */);

    private final Runnable mDrawOffTimeout = () -> update(true /* forceUpdate */);
@@ -130,6 +131,7 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
        }

        }

        int state = getState();

        int state = getState();

        boolean anyFingerprintIcon = state == STATE_FINGERPRINT || state == STATE_FINGERPRINT_ERROR;

        boolean anyFingerprintIcon = state == STATE_FINGERPRINT || state == STATE_FINGERPRINT_ERROR;

        mHasFaceUnlockIcon = state == STATE_FACE_UNLOCK;

        boolean useAdditionalPadding = anyFingerprintIcon;

        boolean useAdditionalPadding = anyFingerprintIcon;

        boolean trustHidden = anyFingerprintIcon;

        boolean trustHidden = anyFingerprintIcon;

        if (state != mLastState || mDeviceInteractive != mLastDeviceInteractive

        if (state != mLastState || mDeviceInteractive != mLastDeviceInteractive
@@ -179,6 +181,11 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
            setRestingAlpha(

            setRestingAlpha(

                    anyFingerprintIcon ? 1f : KeyguardAffordanceHelper.SWIPE_RESTING_ALPHA_AMOUNT);

                    anyFingerprintIcon ? 1f : KeyguardAffordanceHelper.SWIPE_RESTING_ALPHA_AMOUNT);

            setImageDrawable(icon, false);

            setImageDrawable(icon, false);

            if (mHasFaceUnlockIcon) {

                announceForAccessibility(getContext().getString(

                    R.string.accessibility_scanning_face));

            }



            mHasFingerPrintIcon = anyFingerprintIcon;

            mHasFingerPrintIcon = anyFingerprintIcon;

            if (animation != null && isAnim) {

            if (animation != null && isAnim) {

                animation.forceAnimationOnUI();

                animation.forceAnimationOnUI();
@@ -228,6 +235,11 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
            info.addAction(unlock);

            info.addAction(unlock);

            info.setHintText(getContext().getString(

            info.setHintText(getContext().getString(

                    R.string.accessibility_waiting_for_fingerprint));

                    R.string.accessibility_waiting_for_fingerprint));

        } else if (mHasFaceUnlockIcon){

            //Avoid 'button' to be spoken for scanning face

            info.setClassName(LockIcon.class.getName());

            info.setContentDescription(getContext().getString(

                R.string.accessibility_scanning_face));

        }

        }

    }

    }