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

Merge "Content description for next alarm" into lmp-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2014-08-22 00:05:45 +00:00
committed by Android (Google) Code Review
parent 0159ac0cfe 321583d540
commit 048f0cf01c
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
packages/Keyguard/res/layout/keyguard_status_view.xml
View File

@@ -27,8 +27,7 @@
android:layout_height="wrap_content"
androidprv:layout_maxWidth="@dimen/keyguard_security_width"
androidprv:layout_maxHeight="@dimen/keyguard_security_height"
android:gravity="center_horizontal|top"
android:contentDescription="@string/keyguard_accessibility_status">
android:gravity="center_horizontal|top">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"

5
packages/Keyguard/res/values/strings.xml
View File

@@ -115,8 +115,6 @@
<string name="keyguard_accessibility_widget"><xliff:g id="widget_index">%1$s</xliff:g> widget.</string>
<!-- Accessibility description of the lock screen user selector widget. [CHAR_LIMIT=none] -->
<string name="keyguard_accessibility_user_selector">User selector</string>
<!-- Accessibility description of the lock screen status widget. [CHAR_LIMIT=none] -->
<string name="keyguard_accessibility_status">Status</string>
<!-- Accessibility description of the camera widget. [CHAR_LIMIT=none] -->
<string name="keyguard_accessibility_camera">Camera</string>
<!-- Accessibility description of the lock media control widget. [CHAR_LIMIT=none] -->
@@ -176,6 +174,9 @@
<!-- Accessibility description announced when user drags widget away from delete drop target [CHAR LIMIT=NONE] -->
<string name="keyguard_accessibility_delete_widget_end"><xliff:g id="widget_index">%1$s</xliff:g> will not be deleted.</string>
<!-- Accessibility description for the text view that indicates when the next alarm is set (not shown on screen). [CHAR_LIMIT=none] -->
<string name="keyguard_accessibility_next_alarm">Next alarm set for <xliff:g id="alarm" example="Fri 8:30 AM">%1$s</xliff:g></string>
<!-- Password keyboard strings. Used by LockScreen and Settings --><skip />
<!-- Label for "switch to symbols" key. Must be short to fit on key! -->
<string name="password_keyboard_label_symbol_key">\?123</string>

5
packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java
View File

@@ -143,7 +143,10 @@ public class KeyguardStatusView extends GridLayout {
void refreshAlarmStatus(AlarmManager.AlarmClockInfo nextAlarm) {
if (nextAlarm != null) {
mAlarmStatusView.setText(formatNextAlarm(mContext, nextAlarm));
String alarm = formatNextAlarm(mContext, nextAlarm);
mAlarmStatusView.setText(alarm);
mAlarmStatusView.setContentDescription(
getResources().getString(R.string.keyguard_accessibility_next_alarm, alarm));
mAlarmStatusView.setVisibility(View.VISIBLE);
} else {
mAlarmStatusView.setVisibility(View.GONE);