diff options
Diffstat (limited to 'packages')
3 files changed, 23 insertions, 5 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index ca07c87..ef0c9bb 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -67,6 +67,6 @@ android:src="@drawable/ic_lock_24dp" android:scaleType="center" android:tint="#ffffffff" - android:contentDescription="@string/accessibility_unlock_button" /> + android:contentDescription="@string/accessibility_unlock_button_not_secured" /> </com.android.systemui.statusbar.phone.KeyguardBottomAreaView> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 8f05f7b..9ff67bb 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -213,8 +213,6 @@ <string name="accessibility_camera_button">Camera</string> <!-- Content description of the phone button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_phone_button">Phone</string> - <!-- Content description of the unlock button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> - <string name="accessibility_unlock_button">Unlock</string> <!-- Click action label for accessibility for the unlock button. [CHAR LIMIT=NONE] --> <string name="unlock_label">unlock</string> <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] --> @@ -222,6 +220,17 @@ <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] --> <string name="camera_label">open camera</string> + <!-- Content description of the lock icon when device is secured (lock closed) and trust not managed (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_unlock_button_secured">Device secured.</string> + <!-- Content description of the lock icon when device is not secured (lock open) and trust not managed (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_unlock_button_not_secured">Device not secured.</string> + <!-- Content description of the lock icon when device is secured (lock closed) and trust managed (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_unlock_button_secured_trust_managed">Device secured, trust agent active.</string> + <!-- Content description of the lock icon when device is not secured (lock open) and trust managed (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_unlock_button_not_secured_trust_managed">Device not secured, trust agent active.</string> + <!-- Content description of the lock icon when face unlock is running (face icon) and trust managed (not shown on the screen). [CHAR LIMIT=NONE] --> + <string name="accessibility_unlock_button_face_unlock_running">Face detection running, trust agent active.</string> + <!-- Content description of the switch input method button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> <string name="accessibility_ime_switch_button">Switch input method button.</string> <!-- Content description of the compatibility zoom button for accessibility (not shown on the screen). [CHAR LIMIT=NONE] --> diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java index 44d8d23..cb2d40a 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -377,11 +377,20 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL boolean trustManaged = mUnlockMethodCache.isTrustManaged(); mTrustDrawable.setTrustManaged(trustManaged); - // TODO: Update content description depending on state updateLockIconClickability(); + updateLockIconContentDescription(mUnlockMethodCache.isFaceUnlockRunning(), + mUnlockMethodCache.isMethodInsecure(), trustManaged); } - + private void updateLockIconContentDescription(boolean faceUnlockRunning, boolean insecure, + boolean trustManaged) { + mLockIcon.setContentDescription(getResources().getString( + faceUnlockRunning ? R.string.accessibility_unlock_button_face_unlock_running + : insecure && !trustManaged ? R.string.accessibility_unlock_button_not_secured + : insecure ? R.string.accessibility_unlock_button_not_secured_trust_managed + : !trustManaged ? R.string.accessibility_unlock_button_secured + : R.string.accessibility_unlock_button_secured_trust_managed)); + } public KeyguardAffordanceView getPhoneView() { return mPhoneImageView; |