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

Commit 4c722885 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov
Browse files

[SB][Screen Chips] Use correct icon for share-to-app chip. 

Why didn't I use this icon initially you may ask? What a lovely
question. I thought this icon didn't exist when I first started the
screen chips project, but Git tells me the icon was added in 2022, so
I have no idea how I didn't find it. An unsolvable mystery!

Bug: 332662551
Flag: com.android.systemui.status_bar_screen_sharing_chips
Test: Share screen to another app -> verify chip has the "present to
all" icon

Change-Id: I9c50f3f059aff75747ebe85592c516271b567bb2
parent 8ee1902b

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

+1 −2
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ constructor( 
        )



    companion object {

        // TODO(b/332662551): Use the right icon.

        @DrawableRes val SHARE_TO_APP_ICON = R.drawable.ic_screenshot_share

        @DrawableRes val SHARE_TO_APP_ICON = R.drawable.ic_present_to_all

    }

}

packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/sharetoapp/ui/view/EndShareToAppDialogDelegateTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ class EndShareToAppDialogDelegateTest : SysuiTestCase() { 


        underTest.beforeCreate(sysuiDialog, /* savedInstanceState= */ null)



        verify(sysuiDialog).setIcon(R.drawable.ic_screenshot_share)

        verify(sysuiDialog).setIcon(R.drawable.ic_present_to_all)

    }



    @Test

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

+2 −2
Original line number Diff line number Diff line
@@ -128,7 +128,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 


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

            val icon = (latest as OngoingActivityChipModel.Shown).icon

            assertThat((icon as Icon.Resource).res).isEqualTo(R.drawable.ic_screenshot_share)

            assertThat((icon as Icon.Resource).res).isEqualTo(R.drawable.ic_present_to_all)

        }



    @Test
@@ -141,7 +141,7 @@ class ShareToAppChipViewModelTest : SysuiTestCase() { 


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

            val icon = (latest as OngoingActivityChipModel.Shown).icon

            assertThat((icon as Icon.Resource).res).isEqualTo(R.drawable.ic_screenshot_share)

            assertThat((icon as Icon.Resource).res).isEqualTo(R.drawable.ic_present_to_all)

        }



    @Test

packages/SystemUI/tests/src/com/android/systemui/statusbar/chips/ui/viewmodel/OngoingActivityChipsViewModelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ class OngoingActivityChipsViewModelTest : SysuiTestCase() { 
        fun assertIsShareToAppChip(latest: OngoingActivityChipModel?) {

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

            val icon = (latest as OngoingActivityChipModel.Shown).icon

            assertThat((icon as Icon.Resource).res).isEqualTo(R.drawable.ic_screenshot_share)

            assertThat((icon as Icon.Resource).res).isEqualTo(R.drawable.ic_present_to_all)

        }



        fun assertIsCallChip(latest: OngoingActivityChipModel?) {