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

Commit 7c1e1433 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Moved the waiting for fingerprint string to the hint"

parents e0f9f9f8 947c77cb

packages/SystemUI/res/layout/keyguard_bottom_area.xml

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ 
        android:layout_height="@dimen/keyguard_affordance_height"

        android:layout_gravity="bottom|center_horizontal"

        android:src="@drawable/ic_lock_24dp"

        android:contentDescription="@string/accessibility_unlock_button"

        android:scaleType="center" />



</com.android.systemui.statusbar.phone.KeyguardBottomAreaView>

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -221,8 +221,8 @@ 
    <string name="accessibility_voice_assist_button">Voice Assist</string>

    <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_unlock_button">Unlock</string>

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

    <string name="accessibility_unlock_button_fingerprint">Unlock button, waiting for fingerprint</string>

    <!-- Content description hint of the unlock button when fingerprint is on (not shown on the screen). [CHAR LIMIT=NONE] -->

    <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] -->

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

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

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

+2 −6
Original line number Diff line number Diff line
@@ -179,10 +179,6 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
            setRestingAlpha(

                    anyFingerprintIcon ? 1f : KeyguardAffordanceHelper.SWIPE_RESTING_ALPHA_AMOUNT);

            setImageDrawable(icon);

            String contentDescription = getResources().getString(anyFingerprintIcon

                    ? R.string.accessibility_unlock_button_fingerprint

                    : R.string.accessibility_unlock_button);

            setContentDescription(contentDescription);

            mHasFingerPrintIcon = anyFingerprintIcon;

            if (animation != null && isAnim) {

                animation.forceAnimationOnUI();
@@ -225,13 +221,13 @@ public class LockIcon extends KeyguardAffordanceView implements OnUserInfoChange 
    public void onInitializeAccessibilityNodeInfo(AccessibilityNodeInfo info) {

        super.onInitializeAccessibilityNodeInfo(info);

        if (mHasFingerPrintIcon) {

            // Avoid that the button description is also spoken

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

            AccessibilityNodeInfo.AccessibilityAction unlock

                    = new AccessibilityNodeInfo.AccessibilityAction(

                    AccessibilityNodeInfo.ACTION_CLICK,

                    getContext().getString(R.string.accessibility_unlock_without_fingerprint));

            info.addAction(unlock);

            info.setHintText(getContext().getString(

                    R.string.accessibility_waiting_for_fingerprint));

        }

    }