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

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

Merge "Show "Work profile" no matter the work mode QS is on or off"

parents 8eaa922a 83533f49

packages/SystemUI/res/values/strings.xml

+1 −4
Original line number Diff line number Diff line
@@ -804,10 +804,7 @@ 
    the top of their phone's screen. This is a label for a toggle to turn the work profile on and

    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_on_label">Work profile</string>

    <!-- QuickSettings: This is a label for a toggle to turn the work profile on and off and this is

         shown when work profile is off. [CHAR LIMIT=NONE] -->

    <string name="quick_settings_work_mode_off_label">Notifications &amp; apps are off</string>

    <string name="quick_settings_work_mode_label">Work profile</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] -->

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

+1 −2
Original line number Diff line number Diff line
@@ -103,13 +103,12 @@ public class WorkModeTile extends QSTileImpl<BooleanState> implements 
            state.slash.isSlashed = false;

            state.contentDescription =  mContext.getString(

                    R.string.accessibility_quick_settings_work_mode_on);

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

        } else {

            state.slash.isSlashed = true;

            state.contentDescription =  mContext.getString(

                    R.string.accessibility_quick_settings_work_mode_off);

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

        }

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

        state.expandedAccessibilityClassName = Switch.class.getName();

        state.state = state.value ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;

    }