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

Commit 2e649906 authored by William Xiao's avatar William Xiao
Browse files

Enable dream overlay on mobile with dreams v2 flag instead of hub v2

We've decoupled the two so use the new dreams_v2 flag to enable the
dream overlay on mobile.

Bug: 409218143
Test: atest DreamOverlayRegistrantTest
Flag: android.service.dreams.dreams_v2
Change-Id: Id6cdefddf6f52239b3e16b7829b9b283c3cd549a
parent 9d22e423
Loading
Loading
Loading
Loading
+9 −9
Original line number Diff line number Diff line
@@ -23,11 +23,11 @@ import android.content.pm.PackageManager
import android.content.pm.ServiceInfo
import android.platform.test.annotations.DisableFlags
import android.platform.test.annotations.EnableFlags
import android.service.dreams.Flags
import android.service.dreams.IDreamManager
import android.testing.TestableLooper
import androidx.test.ext.junit.runners.AndroidJUnit4
import androidx.test.filters.SmallTest
import com.android.systemui.Flags
import com.android.systemui.SysuiTestCase
import com.android.systemui.communal.domain.interactor.communalSettingsInteractor
import com.android.systemui.communal.domain.interactor.setCommunalV2ConfigEnabled
@@ -123,7 +123,7 @@ class DreamOverlayRegistrantTest : SysuiTestCase() {

    /** Verify overlay registered when enabled in manifest. */
    @Test
    @DisableFlags(Flags.FLAG_GLANCEABLE_HUB_V2)
    @DisableFlags(Flags.FLAG_DREAMS_V2)
    fun testRegisteredWhenEnabledWithManifest() {
        serviceInfo.enabled = true
        start()
@@ -131,10 +131,10 @@ class DreamOverlayRegistrantTest : SysuiTestCase() {
        verify(dreamManager).registerDreamOverlayService(componentName)
    }

    /** Verify overlay registered for mobile hub with flag. */
    /** Verify overlay registered for dreams v2 with flag. */
    @Test
    @EnableFlags(Flags.FLAG_GLANCEABLE_HUB_V2)
    fun testRegisteredForMobileHub() {
    @EnableFlags(Flags.FLAG_DREAMS_V2)
    fun testRegisteredForDreamsV2() {
        kosmos.setCommunalV2ConfigEnabled(true)

        start()
@@ -143,12 +143,12 @@ class DreamOverlayRegistrantTest : SysuiTestCase() {
    }

    /**
     * Make sure dream overlay not registered when not in manifest and not hub mode on mobile is not
     * Make sure dream overlay not registered when not in manifest and not dreams on mobile is not
     * enabled.
     */
    @Test
    @DisableFlags(Flags.FLAG_GLANCEABLE_HUB_V2)
    fun testDisabledForMobileWithoutMobileHub() {
    @DisableFlags(Flags.FLAG_DREAMS_V2)
    fun testDisabledForMobileWithoutDreamsV2() {
        start()

        verify(packageManager, never())
@@ -162,7 +162,7 @@ class DreamOverlayRegistrantTest : SysuiTestCase() {

    /** Ensure service unregistered when component is disabled at runtime. */
    @Test
    @EnableFlags(Flags.FLAG_GLANCEABLE_HUB_V2)
    @EnableFlags(Flags.FLAG_DREAMS_V2)
    fun testUnregisteredWhenComponentDisabled() {
        kosmos.setCommunalV2ConfigEnabled(true)
        start()
+4 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.content.IntentFilter
import android.content.pm.PackageManager
import android.os.PatternMatcher
import android.os.RemoteException
import android.service.dreams.Flags
import android.service.dreams.IDreamManager
import android.util.Log
import com.android.systemui.communal.domain.interactor.CommunalSettingsInteractor
@@ -91,7 +92,7 @@ constructor(
            }

            if (
                communalSettingsInteractor.isV2FlagEnabled() &&
                Flags.dreamsV2() &&
                    packageManager.getComponentEnabledSetting(overlayServiceComponent) ==
                        PackageManager.COMPONENT_ENABLED_STATE_ENABLED
            ) {
@@ -111,8 +112,8 @@ constructor(
            return
        }

        // Enable for hub on mobile
        if (communalSettingsInteractor.isV2FlagEnabled()) {
        // Enable for dreams on mobile.
        if (Flags.dreamsV2()) {
            // Not available on TV or auto
            if (
                packageManager.hasSystemFeature(PackageManager.FEATURE_AUTOMOTIVE) ||