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

Commit b155bdf8 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge "[SB][Chips] Always show privacy-sensitive chips." into main

parents 3d0179ca 833a5c49

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/call/ui/viewmodel/CallChipViewModelTest.kt

+6 −0
Original line number Diff line number Diff line
@@ -106,6 +106,7 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 


            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isFalse()

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isFalse()

        }



    @Test
@@ -117,6 +118,7 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 


            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isFalse()

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isFalse()

        }



    @Test
@@ -128,6 +130,7 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 


            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isFalse()

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isFalse()

        }



    @Test
@@ -152,6 +155,7 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 


            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isTrue()

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isFalse()

        }



    @Test
@@ -176,6 +180,7 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 


            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isTrue()

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isFalse()

        }



    @Test
@@ -200,6 +205,7 @@ class CallChipViewModelTest(flags: FlagsParameterization) : SysuiTestCase() { 


            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isHidden).isTrue()

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isFalse()

        }



    @Test

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/casttootherdevice/ui/viewmodel/CastToOtherDeviceChipViewModelTest.kt

+5 −0
Original line number Diff line number Diff line
@@ -135,6 +135,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
                )



            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isTrue()

            val icon =

                (((latest as OngoingActivityChipModel.Active).icon)

                        as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
@@ -157,6 +158,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
                )



            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isTrue()

            val icon =

                (((latest as OngoingActivityChipModel.Active).icon)

                        as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
@@ -177,6 +179,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
                MediaProjectionState.Projecting.EntireScreen(CAST_TO_OTHER_DEVICES_PACKAGE)



            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isTrue()

            val icon =

                (((latest as OngoingActivityChipModel.Active).icon)

                        as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
@@ -215,6 +218,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 
                )



            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isTrue()

            val icon =

                (((latest as OngoingActivityChipModel.Active).icon)

                        as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
@@ -245,6 +249,7 @@ class CastToOtherDeviceChipViewModelTest : SysuiTestCase() { 


            // Only the projection info will show a timer

            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isTrue()

            val icon =

                (((latest as OngoingActivityChipModel.Active).icon)

                        as OngoingActivityChipModel.ChipIcon.SingleColorIcon)

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/notification/ui/viewmodel/NotifChipsViewModelTest.kt

+1 −0
Original line number Diff line number Diff line
@@ -842,6 +842,7 @@ class NotifChipsViewModelTest : SysuiTestCase() { 
            expectedContentDescriptionSubstrings: List<String> = emptyList(),

        ) {

            val active = latest as OngoingActivityChipModel.Active

            assertThat(active.isImportantForPrivacy).isFalse()

            if (StatusBarConnectedDisplays.isEnabled) {

                assertThat(active.icon)

                    .isInstanceOf(

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/screenrecord/ui/viewmodel/ScreenRecordChipViewModelTest.kt

+4 −0
Original line number Diff line number Diff line
@@ -110,6 +110,7 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { 
            screenRecordRepo.screenRecordState.value = ScreenRecordModel.Starting(400)



            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Countdown::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isTrue()

            assertThat((latest as OngoingActivityChipModel.Active).icon).isNull()

            assertThat((latest as OngoingActivityChipModel.Active).onClickListenerLegacy).isNull()

        }
@@ -156,6 +157,7 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { 
            screenRecordRepo.screenRecordState.value = ScreenRecordModel.Recording



            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isTrue()

            val icon =

                (((latest as OngoingActivityChipModel.Active).icon)

                        as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
@@ -261,6 +263,7 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { 
            mediaProjectionRepo.mediaProjectionState.value = MediaProjectionState.NotProjecting



            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isTrue()

            assertThat((latest as OngoingActivityChipModel.Active.Timer).startTimeMs)

                .isEqualTo(1234)
@@ -275,6 +278,7 @@ class ScreenRecordChipViewModelTest : SysuiTestCase() { 


            // THEN the start time is still the old start time

            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isTrue()

            assertThat((latest as OngoingActivityChipModel.Active.Timer).startTimeMs)

                .isEqualTo(1234)

        }

packages/SystemUI/multivalentTests/src/com/android/systemui/statusbar/chips/sharetoapp/ui/viewmodel/ShareToAppChipViewModelTest.kt

+3 −0
Original line number Diff line number Diff line
@@ -384,6 +384,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 
                MediaProjectionState.Projecting.NoScreen(NORMAL_PACKAGE, hostDeviceName = null)



            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.IconOnly::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isTrue()

            val icon =

                (((latest as OngoingActivityChipModel.Active).icon)

                        as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
@@ -407,6 +408,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 
                )



            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isTrue()

            val icon =

                (((latest as OngoingActivityChipModel.Active).icon)

                        as OngoingActivityChipModel.ChipIcon.SingleColorIcon)
@@ -424,6 +426,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 
                MediaProjectionState.Projecting.EntireScreen(NORMAL_PACKAGE)



            assertThat(latest).isInstanceOf(OngoingActivityChipModel.Active.Timer::class.java)

            assertThat((latest as OngoingActivityChipModel.Active).isImportantForPrivacy).isTrue()

            val icon =

                (((latest as OngoingActivityChipModel.Active).icon)

                        as OngoingActivityChipModel.ChipIcon.SingleColorIcon)