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

Commit 8cbf1fb1 authored by Justin Klaassen's avatar Justin Klaassen
Browse files

Fix contentDescription for NightDisplayTile 

Fixes: 32092641
Test: Manually verified TalkBack description for "Night Light" tile.
Change-Id: Id950e3e8111ec21e71c2761ee2874baa769c9474
parent edbaeb81

packages/SystemUI/res/values/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -755,10 +755,6 @@ 
    <string name="quick_settings_work_mode_label">Work mode</string>

    <!-- QuickSettings: Label for the toggle to activate Night display (renamed "Night Light" with title caps). [CHAR LIMIT=20] -->

    <string name="quick_settings_night_display_label">Night Light</string>

    <!-- QuickSettings: Summary for the toggle to deactivate Night display when it's on (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->

    <string name="quick_settings_night_display_summary_on">Night Light on, tap to turn off</string>

    <!-- QuickSettings: Label for the toggle to activate Night display when it's off (renamed "Night Light" with title caps). [CHAR LIMIT=NONE] -->

    <string name="quick_settings_night_display_summary_off">Night Light off, tap to turn on</string>



    <!-- Recents: The empty recents string. [CHAR LIMIT=NONE] -->

    <string name="recents_empty_message">No recent items</string>

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

+4 −6
Original line number Diff line number Diff line
@@ -75,14 +75,12 @@ public class NightDisplayTile extends QSTile<QSTile.BooleanState> 
    protected void handleUpdateState(BooleanState state, Object arg) {

        final boolean isActivated = mController.isActivated();

        state.value = isActivated;

        state.label = mContext.getString(R.string.quick_settings_night_display_label);

        state.label = state.contentDescription =

                mContext.getString(R.string.quick_settings_night_display_label);

        state.icon = ResourceIcon.get(isActivated ? R.drawable.ic_qs_night_display_on

                : R.drawable.ic_qs_night_display_off);

        state.contentDescription = mContext.getString(isActivated

                ? R.string.quick_settings_night_display_summary_on

                : R.string.quick_settings_night_display_summary_off);

        state.minimalAccessibilityClassName = state.expandedAccessibilityClassName

                = Switch.class.getName();

        state.minimalAccessibilityClassName = state.expandedAccessibilityClassName =

                Switch.class.getName();

    }



    @Override