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

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

Merge "Fix migration of O DND visual effects settings"

parents a03a9920 45013878

core/java/android/service/notification/ZenModeConfig.java

+2 −2
Original line number Diff line number Diff line
@@ -498,7 +498,7 @@ public class ZenModeConfig implements Parcelable { 
                    Boolean allowWhenScreenOff = unsafeBoolean(parser, ALLOW_ATT_SCREEN_OFF);

                    if (allowWhenScreenOff != null) {

                        readSuppressedEffects = true;

                        if (allowWhenScreenOff) {

                        if (!allowWhenScreenOff) {

                            rt.suppressedVisualEffects |= SUPPRESSED_EFFECT_LIGHTS

                                    | SUPPRESSED_EFFECT_FULL_SCREEN_INTENT;

                        }
@@ -506,7 +506,7 @@ public class ZenModeConfig implements Parcelable { 
                    Boolean allowWhenScreenOn = unsafeBoolean(parser, ALLOW_ATT_SCREEN_ON);

                    if (allowWhenScreenOn != null) {

                        readSuppressedEffects = true;

                        if (allowWhenScreenOn) {

                        if (!allowWhenScreenOn) {

                            rt.suppressedVisualEffects |= SUPPRESSED_EFFECT_PEEK;

                        }

                    }

services/tests/uiservicestests/src/com/android/server/notification/ZenModeHelperTest.java

+6 −6
Original line number Diff line number Diff line
@@ -648,7 +648,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
        String xml = "<zen version=\"6\" user=\"0\">\n"

                + "<allow calls=\"false\" repeatCallers=\"false\" messages=\"true\" "

                + "reminders=\"false\" events=\"false\" callsFrom=\"1\" messagesFrom=\"2\" "

                + "visualScreenOff=\"false\" alarms=\"true\" "

                + "visualScreenOff=\"true\" alarms=\"true\" "

                + "media=\"true\" system=\"false\" />\n"

                + "<disallow visualEffects=\"511\" />"

                + "</zen>";
@@ -664,7 +664,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
        xml = "<zen version=\"6\" user=\"0\">\n"

                + "<allow calls=\"false\" repeatCallers=\"false\" messages=\"true\" "

                + "reminders=\"false\" events=\"false\" callsFrom=\"1\" messagesFrom=\"2\" "

                + "visualScreenOn=\"false\" alarms=\"true\" "

                + "visualScreenOn=\"true\" alarms=\"true\" "

                + "media=\"true\" system=\"false\" />\n"

                + "<disallow visualEffects=\"511\" />"

                + "</zen>";
@@ -683,7 +683,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
        String xml = "<zen version=\"6\" user=\"0\">\n"

                + "<allow calls=\"false\" repeatCallers=\"false\" messages=\"true\" "

                + "reminders=\"false\" events=\"false\" callsFrom=\"1\" messagesFrom=\"2\" "

                + "visualScreenOff=\"false\" visualScreenOn=\"false\" alarms=\"true\" "

                + "visualScreenOff=\"true\" visualScreenOn=\"true\" alarms=\"true\" "

                + "media=\"true\" system=\"false\" />\n"

                + "<disallow visualEffects=\"511\" />"

                + "</zen>";
@@ -702,7 +702,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
        String xml = "<zen version=\"6\" user=\"0\">\n"

                + "<allow calls=\"false\" repeatCallers=\"false\" messages=\"true\" "

                + "reminders=\"false\" events=\"false\" callsFrom=\"1\" messagesFrom=\"2\" "

                + "visualScreenOff=\"true\" visualScreenOn=\"true\" alarms=\"true\" "

                + "visualScreenOff=\"false\" visualScreenOn=\"false\" alarms=\"true\" "

                + "media=\"true\" system=\"false\" />\n"

                + "<disallow visualEffects=\"511\" />"

                + "</zen>";
@@ -721,7 +721,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
        xml = "<zen version=\"6\" user=\"0\">\n"

                + "<allow calls=\"false\" repeatCallers=\"false\" messages=\"true\" "

                + "reminders=\"false\" events=\"false\" callsFrom=\"1\" messagesFrom=\"2\" "

                + "visualScreenOff=\"false\" visualScreenOn=\"true\" alarms=\"true\" "

                + "visualScreenOff=\"true\" visualScreenOn=\"false\" alarms=\"true\" "

                + "media=\"true\" system=\"false\" />\n"

                + "<disallow visualEffects=\"511\" />"

                + "</zen>";
@@ -737,7 +737,7 @@ public class ZenModeHelperTest extends UiServiceTestCase { 
        xml = "<zen version=\"6\" user=\"0\">\n"

                + "<allow calls=\"false\" repeatCallers=\"false\" messages=\"true\" "

                + "reminders=\"false\" events=\"false\" callsFrom=\"1\" messagesFrom=\"2\" "

                + "visualScreenOff=\"true\" visualScreenOn=\"false\" alarms=\"true\" "

                + "visualScreenOff=\"false\" visualScreenOn=\"true\" alarms=\"true\" "

                + "media=\"true\" system=\"false\" />\n"

                + "<disallow visualEffects=\"511\" />"

                + "</zen>";