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

Commit bec7e553 authored by Matías Hernández's avatar Matías Hernández
Browse files

Change "Set up" text in mode tiles into "Not set" 

Fixes: 371174550
Test: atest ModesDialogViewModelTest
Flag: android.app.modes_ui
Change-Id: If25b64bba9cdf314c93a1bfa1719059fe277cc79
parent 93be8227

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/policy/ui/dialog/viewmodel/ModesDialogViewModelTest.kt

+10 −10
Original line number Diff line number Diff line
@@ -61,7 +61,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { 
            interactor,

            kosmos.testDispatcher,

            mockDialogDelegate,

            mockDialogEventLogger

            mockDialogEventLogger,

        )



    @Test
@@ -97,7 +97,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { 
            assertThat(tiles?.size).isEqualTo(3)

            with(tiles?.elementAt(0)!!) {

                assertThat(this.text).isEqualTo("Disabled by other")

                assertThat(this.subtext).isEqualTo("Set up")

                assertThat(this.subtext).isEqualTo("Not set")

                assertThat(this.enabled).isEqualTo(false)

            }

            with(tiles?.elementAt(1)!!) {
@@ -323,10 +323,10 @@ class ModesDialogViewModelTest : SysuiTestCase() { 
            assertThat(tiles!!).hasSize(6)

            assertThat(tiles!![0].subtext).isEqualTo("When the going gets tough")

            assertThat(tiles!![1].subtext).isEqualTo("On • When in Rome")

            assertThat(tiles!![2].subtext).isEqualTo("Set up")

            assertThat(tiles!![2].subtext).isEqualTo("Not set")

            assertThat(tiles!![3].subtext).isEqualTo("Off")

            assertThat(tiles!![4].subtext).isEqualTo("On")

            assertThat(tiles!![5].subtext).isEqualTo("Set up")

            assertThat(tiles!![5].subtext).isEqualTo("Not set")

        }



    @Test
@@ -387,7 +387,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { 
            }

            with(tiles?.elementAt(2)!!) {

                assertThat(this.stateDescription).isEqualTo("Off")

                assertThat(this.subtextDescription).isEqualTo("Set up")

                assertThat(this.subtextDescription).isEqualTo("Not set")

            }

            with(tiles?.elementAt(3)!!) {

                assertThat(this.stateDescription).isEqualTo("Off")
@@ -399,7 +399,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { 
            }

            with(tiles?.elementAt(5)!!) {

                assertThat(this.stateDescription).isEqualTo("Off")

                assertThat(this.subtextDescription).isEqualTo("Set up")

                assertThat(this.subtextDescription).isEqualTo("Not set")

            }



            // All tiles have the same long click info
@@ -451,7 +451,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { 
                        .setName("Active without manual")

                        .setActive(true)

                        .setManualInvocationAllowed(false)

                        .build(),

                        .build()

                )

            )

            runCurrent()
@@ -492,7 +492,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { 
                        .setId("ID")

                        .setName("Disabled by other")

                        .setEnabled(false, /* byUser= */ false)

                        .build(),

                        .build()

                )

            )

            runCurrent()
@@ -500,7 +500,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { 
            assertThat(tiles?.size).isEqualTo(1)

            with(tiles?.elementAt(0)!!) {

                assertThat(this.text).isEqualTo("Disabled by other")

                assertThat(this.subtext).isEqualTo("Set up")

                assertThat(this.subtext).isEqualTo("Not set")

                assertThat(this.enabled).isEqualTo(false)



                // Click the tile
@@ -519,7 +519,7 @@ class ModesDialogViewModelTest : SysuiTestCase() { 
            // Check that nothing happened to the tile

            with(tiles?.elementAt(0)!!) {

                assertThat(this.text).isEqualTo("Disabled by other")

                assertThat(this.subtext).isEqualTo("Set up")

                assertThat(this.subtext).isEqualTo("Not set")

                assertThat(this.enabled).isEqualTo(false)

            }

        }

packages/SystemUI/res/values/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -1120,7 +1120,7 @@ 
    <string name="zen_mode_off">Off</string>



    <!-- Modes: label for a mode that needs to be set up [CHAR LIMIT=35] -->

    <string name="zen_mode_set_up">Set up</string>

    <string name="zen_mode_set_up">Not set</string>



    <!-- Modes: label for a mode that cannot be manually turned on [CHAR LIMIT=35] -->

    <string name="zen_mode_no_manual_invocation">Manage in settings</string>

packages/SystemUI/src/com/android/systemui/statusbar/policy/ui/dialog/viewmodel/ModesDialogViewModel.kt

+7 −7
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ constructor( 
                        // can be manually toggled on

                        mode.rule.isEnabled -> mode.isActive || mode.rule.isManualInvocationAllowed

                        // Mode was created as disabled, or disabled by the app that owns it ->

                        // will be shown with a "Set up" text

                        // will be shown with a "Not set" text

                        !mode.rule.isEnabled -> mode.status == ZenMode.Status.DISABLED_BY_OTHER

                        else -> false

                    }
@@ -120,7 +120,7 @@ constructor( 
                        },

                        onLongClick = { openSettings(mode) },

                        onLongClickLabel =

                            context.resources.getString(R.string.accessibility_long_click_tile)

                            context.resources.getString(R.string.accessibility_long_click_tile),

                    )

                }

            }
@@ -174,7 +174,7 @@ constructor( 
                    context,

                    R.style.Theme_SystemUI_Dialog,

                    /* cancelIsNeutral= */ true,

                    zenDialogMetricsLogger

                    zenDialogMetricsLogger,

                )

                .createDialog()

        SystemUIDialog.applyFlags(dialog)