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

Commit b298676d authored by Matt Casey's avatar Matt Casey Committed by Automerger Merge Worker
Browse files

Merge "Revert "Revert "CHOOSER_UNBUNDLED -> droidfood""" into tm-qpr-dev am:... 

Merge "Revert "Revert "CHOOSER_UNBUNDLED -> droidfood""" into tm-qpr-dev am: 91066345 am: d3179337

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21303173



Change-Id: I46fb33cb02f27a01f293ab92dc8dd8f6faa0481e
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e930c935 d3179337

packages/SystemUI/src/com/android/systemui/flags/Flags.kt

+1 −1
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ object Flags { 


    // 1500 - chooser aka sharesheet

    // TODO(b/254512507): Tracking Bug

    val CHOOSER_UNBUNDLED = unreleasedFlag(1500, "chooser_unbundled", teamfood = true)

    val CHOOSER_UNBUNDLED = releasedFlag(1500, "chooser_unbundled")



    // TODO(b/266983432) Tracking Bug

    val SHARESHEET_CUSTOM_ACTIONS =

packages/SystemUI/tests/src/com/android/systemui/ChooserSelectorTest.kt

+13 −8
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ import com.android.systemui.flags.FeatureFlags 
import com.android.systemui.flags.Flag

import com.android.systemui.flags.FlagListenable

import com.android.systemui.flags.Flags

import com.android.systemui.flags.ReleasedFlag

import com.android.systemui.flags.UnreleasedFlag

import com.android.systemui.settings.UserTracker

import com.android.systemui.util.mockito.any
@@ -102,7 +103,7 @@ class ChooserSelectorTest : SysuiTestCase() { 
    @Test

    fun initialize_enablesUnbundledChooser_whenFlagEnabled() {

        // Arrange

        whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(true)

        setFlagMock(true)



        // Act

        chooserSelector.start()
@@ -118,7 +119,7 @@ class ChooserSelectorTest : SysuiTestCase() { 
    @Test

    fun initialize_disablesUnbundledChooser_whenFlagDisabled() {

        // Arrange

        whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(false)

        setFlagMock(false)



        // Act

        chooserSelector.start()
@@ -134,7 +135,7 @@ class ChooserSelectorTest : SysuiTestCase() { 
    @Test

    fun enablesUnbundledChooser_whenFlagBecomesEnabled() {

        // Arrange

        whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(false)

        setFlagMock(false)

        chooserSelector.start()

        verify(mockFeatureFlags).addListener(

                eq<Flag<*>>(Flags.CHOOSER_UNBUNDLED),
@@ -147,7 +148,7 @@ class ChooserSelectorTest : SysuiTestCase() { 
        )



        // Act

        whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(true)

        setFlagMock(true)

        flagListener.value.onFlagChanged(TestFlagEvent(Flags.CHOOSER_UNBUNDLED.name))



        // Assert
@@ -161,7 +162,7 @@ class ChooserSelectorTest : SysuiTestCase() { 
    @Test

    fun disablesUnbundledChooser_whenFlagBecomesDisabled() {

        // Arrange

        whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(true)

        setFlagMock(true)

        chooserSelector.start()

        verify(mockFeatureFlags).addListener(

                eq<Flag<*>>(Flags.CHOOSER_UNBUNDLED),
@@ -174,7 +175,7 @@ class ChooserSelectorTest : SysuiTestCase() { 
        )



        // Act

        whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(false)

        setFlagMock(false)

        flagListener.value.onFlagChanged(TestFlagEvent(Flags.CHOOSER_UNBUNDLED.name))



        // Assert
@@ -188,7 +189,7 @@ class ChooserSelectorTest : SysuiTestCase() { 
    @Test

    fun doesNothing_whenAnotherFlagChanges() {

        // Arrange

        whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(false)

        setFlagMock(false)

        chooserSelector.start()

        verify(mockFeatureFlags).addListener(

                eq<Flag<*>>(Flags.CHOOSER_UNBUNDLED),
@@ -197,13 +198,17 @@ class ChooserSelectorTest : SysuiTestCase() { 
        clearInvocations(mockPackageManager)



        // Act

        whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(false)

        flagListener.value.onFlagChanged(TestFlagEvent("other flag"))



        // Assert

        verifyZeroInteractions(mockPackageManager)

    }



    private fun setFlagMock(enabled: Boolean) {

        whenever(mockFeatureFlags.isEnabled(any<UnreleasedFlag>())).thenReturn(enabled)

        whenever(mockFeatureFlags.isEnabled(any<ReleasedFlag>())).thenReturn(enabled)

    }



    private class TestFlagEvent(override val flagName: String) : FlagListenable.FlagEvent {

        override fun requestNoRestart() {}

    }