Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am ddd6040d: am 4c1f1f87: Merge "Revert "Content description for padlock icon depending on state"" into lmp-dev

Browse Source 
* commit 'ddd6040dadfe56f5bc9809e436f4a75538296a38':
  Revert "Content description for padlock icon depending on state"
This commit is contained in:
Jorim Jaggi
2014-08-29 18:52:27 +00:00
committed by Android Git Automerger
parent 0c91868065 9acdc4a37c
commit 2e09793c2e
3 changed files with 4 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/SystemUI/res/layout/keyguard_bottom_area.xml
View File

@@ -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" />
</com.android.systemui.statusbar.phone.KeyguardBottomAreaView>

13
packages/SystemUI/res/values/strings.xml
View File

@@ -213,6 +213,8 @@
<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] -->
@@ -220,17 +222,6 @@
<!-- 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] -->

13
packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBottomAreaView.java
View File

@@ -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;