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

Commit edd7215f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "DndTile includes secondary label in content descr." into pi-dev

parents 2cc537a2 92ed74f9

packages/SystemUI/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -519,8 +519,8 @@ 
    <string name="accessibility_quick_settings_airplane_changed_off">Airplane mode turned off.</string>

    <!-- Announcement made when the airplane mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_airplane_changed_on">Airplane mode turned on.</string>

    <!-- Content description of the do not disturb tile in quick settings when on in priority (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_dnd_priority_on">Do not disturb on, priority only.</string>

    <!-- Content description of the do not disturb tile in quick settings when on in the default priority mode (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_dnd_priority_on">Do not disturb on.</string>

    <!-- Content description of the do not disturb tile in quick settings when on in none (not shown on the screen). [CHAR LIMIT=NONE] -->

    <string name="accessibility_quick_settings_dnd_none_on">Do not disturb on, total silence.</string>

    <!-- Content description of the do not disturb tile in quick settings when on in alarms only (not shown on the screen). [CHAR LIMIT=NONE] -->

packages/SystemUI/src/com/android/systemui/qs/tiles/DndTile.java

+6 −3
Original line number Diff line number Diff line
@@ -215,15 +215,18 @@ public class DndTile extends QSTileImpl<BooleanState> { 
        switch (zen) {

            case Global.ZEN_MODE_IMPORTANT_INTERRUPTIONS:

                state.contentDescription = mContext.getString(

                        R.string.accessibility_quick_settings_dnd_priority_on);

                        R.string.accessibility_quick_settings_dnd_priority_on) + ", "

                        + state.secondaryLabel;

                break;

            case Global.ZEN_MODE_NO_INTERRUPTIONS:

                state.contentDescription = mContext.getString(

                        R.string.accessibility_quick_settings_dnd_none_on);

                        R.string.accessibility_quick_settings_dnd_none_on) + ", "

                        + state.secondaryLabel;

                break;

            case ZEN_MODE_ALARMS:

                state.contentDescription = mContext.getString(

                        R.string.accessibility_quick_settings_dnd_alarms_on);

                        R.string.accessibility_quick_settings_dnd_alarms_on) + ", "

                        + state.secondaryLabel;

                break;

            default:

                state.contentDescription = mContext.getString(