diff options
| author | Selim Cinek <cinek@google.com> | 2015-06-19 18:44:50 -0700 |
|---|---|---|
| committer | Selim Cinek <cinek@google.com> | 2015-06-20 03:23:57 +0000 |
| commit | c99d9a95643c514ee0a671f023359931df443077 (patch) | |
| tree | b3a049f1131c1ce6447ef0c9dcd82b29228d9129 /packages/SystemUI/res | |
| parent | 08d9834c1bbba5f7dd284ea648e45db8a7db115b (diff) | |
| download | frameworks_base-c99d9a95643c514ee0a671f023359931df443077.zip frameworks_base-c99d9a95643c514ee0a671f023359931df443077.tar.gz frameworks_base-c99d9a95643c514ee0a671f023359931df443077.tar.bz2 | |
Fixed content description of the lock icon when fingerprint is on
Also surfacing Fingerprint Errors now with a message.
Bug: 21565811
Change-Id: I3bba66303c08313dbca1df5ef2f20b251f541bc1
Diffstat (limited to 'packages/SystemUI/res')
| -rw-r--r-- | packages/SystemUI/res/layout/keyguard_bottom_area.xml | 3 | ||||
| -rw-r--r-- | packages/SystemUI/res/values/strings.xml | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/packages/SystemUI/res/layout/keyguard_bottom_area.xml b/packages/SystemUI/res/layout/keyguard_bottom_area.xml index 48af565..1488ad6 100644 --- a/packages/SystemUI/res/layout/keyguard_bottom_area.xml +++ b/packages/SystemUI/res/layout/keyguard_bottom_area.xml @@ -68,7 +68,6 @@ android:layout_height="@dimen/keyguard_affordance_height" android:layout_gravity="bottom|center_horizontal" android:src="@drawable/ic_lock_24dp" - android:scaleType="center" - android:contentDescription="@string/accessibility_unlock_button" /> + android:scaleType="center" /> </com.android.systemui.statusbar.phone.KeyguardBottomAreaView> diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index 47c642d..e2a318a 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -215,6 +215,10 @@ <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> + <!-- 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] --> <string name="unlock_label">unlock</string> <!-- Click action label for accessibility for the phone button. [CHAR LIMIT=NONE] --> |