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

Commit 30bfbcac authored by Beverly's avatar Beverly
Browse files

Default zen rules updated. 

On locale change, the name of the rule will change based on locale.
The default automatic scheduled rules will exit on alarm.

Test: manual
Change-Id: I75976706493a4350bd64f15bb64c30e914e21397
Fixes: 38128497
parent 9cec424d

services/core/java/com/android/server/notification/ZenModeHelper.java

+13 −6
Original line number Diff line number Diff line
@@ -126,12 +126,6 @@ public class ZenModeHelper { 
        mAppOps = (AppOpsManager) context.getSystemService(Context.APP_OPS_SERVICE);



        mDefaultConfig = new ZenModeConfig();

        mDefaultRuleWeeknightsName = mContext.getResources()

                .getString(R.string.zen_mode_default_weeknights_name);

        mDefaultRuleWeekendsName = mContext.getResources()

                .getString(R.string.zen_mode_default_weekends_name);

        mDefaultRuleEventsName = mContext.getResources()

                .getString(R.string.zen_mode_default_events_name);

        setDefaultZenRules(mContext);

        mConfig = mDefaultConfig;

        mConfigs.put(UserHandle.USER_SYSTEM, mConfig);
@@ -436,6 +430,7 @@ public class ZenModeHelper { 
    }



    private void appendDefaultRules (ZenModeConfig config) {

        getDefaultRuleNames();

        appendDefaultScheduleRules(config);

        appendDefaultEventRules(config);

    }
@@ -815,6 +810,16 @@ public class ZenModeHelper { 
        }

    }



    private void getDefaultRuleNames() {

        // on locale-change, these values differ

        mDefaultRuleWeeknightsName = mContext.getResources()

                .getString(R.string.zen_mode_default_weeknights_name);

        mDefaultRuleWeekendsName = mContext.getResources()

                .getString(R.string.zen_mode_default_weekends_name);

        mDefaultRuleEventsName = mContext.getResources()

                .getString(R.string.zen_mode_default_events_name);

    }



    @VisibleForTesting

    protected void applyRestrictions() {

        final boolean zen = mZenMode != Global.ZEN_MODE_OFF;
@@ -928,6 +933,7 @@ public class ZenModeHelper { 
        weeknights.days = ZenModeConfig.WEEKNIGHT_DAYS;

        weeknights.startHour = 22;

        weeknights.endHour = 7;

        weeknights.exitAtAlarm = true;

        final ZenRule rule1 = new ZenRule();

        rule1.enabled = false;

        rule1.name = mDefaultRuleWeeknightsName;
@@ -943,6 +949,7 @@ public class ZenModeHelper { 
        weekends.startHour = 23;

        weekends.startMinute = 30;

        weekends.endHour = 10;

        weekends.exitAtAlarm = true;

        final ZenRule rule2 = new ZenRule();

        rule2.enabled = false;

        rule2.name = mDefaultRuleWeekendsName;