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

Commit fb2452f5 authored by Julia Reynolds's avatar Julia Reynolds Committed by android-build-merger
Browse files

Zen settings screen update am: 56b748d6

am: 4faa353f

Change-Id: Ifd7d390db0373561b9a5536b412373579dadc8e3
parents 744bb1c4 4faa353f
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -6686,7 +6686,7 @@
    <string name="zen_mode_summary_combination"><xliff:g id="mode" example="Priority only">%1$s</xliff:g>: <xliff:g id="exit condition" example="Until you turn this off">%2$s</xliff:g></string>
    <!--  Do not disturb: Title for the Visual interruptions option and associated settings page. [CHAR LIMIT=30] -->
    <string name="zen_mode_visual_interruptions_settings_title">Block visual disturbances</string>
    <string name="zen_mode_visual_interruptions_settings_title">Block visual signals</string>
    <!-- Work Sounds: Work sound settings section header.  [CHAR LIMIT=50] -->
    <string name="sound_work_settings">Work profile sounds</string>
+1 −3
Original line number Diff line number Diff line
@@ -172,9 +172,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
                ? getString(R.string.switch_off_text)
                : getString(R.string.zen_mode_rule_summary_enabled_combination, mode);

        return isSystemRule ? ruleState
                : getString(R.string.zen_mode_rule_summary_provider_combination,
                        providerLabel, ruleState);
        return ruleState;
    }

    private static ManagedServiceSettings.Config getConditionProviderConfig() {