Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 048f0cf0 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

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

parents 0159ac0c 321583d5

packages/Keyguard/res/layout/keyguard_status_view.xml

+1 −2
Original line number Diff line number Diff line
@@ -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"

packages/Keyguard/res/values/strings.xml

+3 −2
Original line number Diff line number Diff line
@@ -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>

packages/Keyguard/src/com/android/keyguard/KeyguardStatusView.java

+4 −1
Original line number Diff line number Diff line
@@ -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);