diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index ef0c9bb967f4d..ca07c87498d60 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_not_secured" /> + android:contentDescription="@string/accessibility_unlock_button" /> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index b000a48d3fca8..07943e146ae8b 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -213,6 +213,8 @@ Camera Phone + + Unlock unlock @@ -220,17 +222,6 @@ open camera - - Device secured. - - Device not secured. - - Device secured, trust agent active. - - Device not secured, trust agent active. - - Face detection running, trust agent active. - Switch input method button. 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 62552b217dbbb..f9da30ffbdd59 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java @@ -380,21 +380,10 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL mLockIcon.setImageResource(iconRes); boolean trustManaged = mUnlockMethodCache.isTrustManaged(); mTrustDrawable.setTrustManaged(trustManaged); - 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;