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

Commit c7e571f4 authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Automerger Merge Worker
Browse files

Merge "Change secondary label for Work mode tile" into sc-dev am: 1a2a958d

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14421937

Change-Id: Ie3f399b5402ceeeb5b9e7a2a0fdc11e4cb062b4a
parents 9ed9b1cb 1a2a958d
Loading
Loading
Loading
Loading
+4 −2
Original line number Diff line number Diff line
@@ -690,11 +690,11 @@
    <!-- Announcement made when the screen stopped casting (not shown on the screen). [CHAR LIMIT=NONE] -->
    <string name="accessibility_casting_turned_off">Screen casting stopped.</string>
    <!-- Content description of the work mode title in quick settings when off (not shown on the screen). [CHAR LIMIT=NONE] -->
    <string name="accessibility_quick_settings_work_mode_off">Work mode off.</string>
    <string name="accessibility_quick_settings_work_mode_off">Work mode paused.</string>
    <!-- Content description of the work mode title in quick settings when on (not shown on the screen). [CHAR LIMIT=NONE] -->
    <string name="accessibility_quick_settings_work_mode_on">Work mode on.</string>
    <!-- Announcement made when the work mode changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
    <string name="accessibility_quick_settings_work_mode_changed_off">Work mode turned off.</string>
    <string name="accessibility_quick_settings_work_mode_changed_off">Work mode turned paused.</string>
    <!-- Announcement made when the work mode changes to on (not shown on the screen). [CHAR LIMIT=NONE] -->
    <string name="accessibility_quick_settings_work_mode_changed_on">Work mode turned on.</string>
    <!-- Announcement made when the Data Saver changes to off (not shown on the screen). [CHAR LIMIT=NONE] -->
@@ -954,6 +954,8 @@
    off. "Work profile" means a separate profile on a user's phone that's specifically for their
    work apps and managed by their company. "Work" is used as an adjective. [CHAR LIMIT=NONE] -->
    <string name="quick_settings_work_mode_label">Work profile</string>
    <!-- QuickSettings: Secondary label for work mode tile when it's off. [CHAR LIMIT=NONE] -->
    <string name="quick_settings_work_mode_paused">Paused</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: Secondary text for when the Night Light will be enabled at sunset. [CHAR LIMIT=20] -->
+2 −0
Original line number Diff line number Diff line
@@ -129,6 +129,8 @@ public class WorkModeTile extends QSTileImpl<BooleanState> implements
        state.contentDescription = state.label;
        state.expandedAccessibilityClassName = Switch.class.getName();
        state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
        state.secondaryLabel = state.value ? "" :
                mContext.getString(R.string.quick_settings_work_mode_paused);
    }

    @Override