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

Commit 479067ae authored by William Xiao's avatar William Xiao
Browse files

Turn off GlanceableHubContainerController when scene container is enabled 

This class is only used to add and manage the glanceable hub when
flexiglass is not enabled and should not run when flexiglass is enabled

Bug: 338072097
Fix: 321332798
Test: atest GlanceableHubContainerControllerTest NotificationShadeWindowViewControllerTest
      also manually verified that there are not crashes when turning
      flexiglass on with this change
Flag: ACONFIG com.android.systemui.communal_hub TEAMFOOD
Change-Id: I89c2094fca8fb8162de1f4b2ccdca01e9c074b9b
parent 99c0de24

packages/SystemUI/src/com/android/systemui/shade/GlanceableHubContainerController.kt

+4 −0
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInterac 
import com.android.systemui.keyguard.shared.model.KeyguardState

import com.android.systemui.lifecycle.repeatWhenAttached

import com.android.systemui.res.R

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.scene.shared.model.SceneDataSourceDelegator

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.statusbar.phone.SystemUIDialogFactory
@@ -197,6 +198,7 @@ constructor( 
    /** Override for testing. */

    @VisibleForTesting

    internal fun initView(containerView: View): View {

        SceneContainerFlag.assertInLegacyMode()

        if (communalContainerView != null) {

            throw RuntimeException("Communal view has already been initialized")

        }
@@ -306,6 +308,7 @@ constructor( 


    /** Removes the container view from its parent. */

    fun disposeView() {

        SceneContainerFlag.assertInLegacyMode()

        communalContainerView?.let {

            (it.parent as ViewGroup).removeView(it)

            lifecycleRegistry.currentState = Lifecycle.State.CREATED
@@ -323,6 +326,7 @@ constructor( 
     * to be fully in control of its own touch handling.

     */

    fun onTouchEvent(ev: MotionEvent): Boolean {

        SceneContainerFlag.assertInLegacyMode()

        return communalContainerView?.let { handleTouchEventOnCommunalView(it, ev) } ?: false

    }

packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowViewController.java

+8 −1
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInterac 
import com.android.systemui.keyguard.shared.model.TransitionState;

import com.android.systemui.keyguard.shared.model.TransitionStep;

import com.android.systemui.res.R;

import com.android.systemui.scene.shared.flag.SceneContainerFlag;

import com.android.systemui.shade.domain.interactor.PanelExpansionInteractor;

import com.android.systemui.shared.animation.DisableSubpixelTextTransitionListener;

import com.android.systemui.statusbar.DragDownHelper;
@@ -357,7 +358,9 @@ public class NotificationShadeWindowViewController implements Dumpable { 
                mFalsingCollector.onTouchEvent(ev);

                mPulsingWakeupGestureHandler.onTouchEvent(ev);



                if (mGlanceableHubContainerController.onTouchEvent(ev)) {

                if (!SceneContainerFlag.isEnabled()

                        && mGlanceableHubContainerController.onTouchEvent(ev)) {

                    // GlanceableHubContainerController is only used pre-flexiglass.

                    return logDownDispatch(ev, "dispatched to glanceable hub container", true);

                }

                if (mDreamingWakeupGestureHandler != null
@@ -621,6 +624,10 @@ public class NotificationShadeWindowViewController implements Dumpable { 
     * The layout lives in {@link R.id.communal_ui_stub}.

     */

    public void setupCommunalHubLayout() {

        if (SceneContainerFlag.isEnabled()) {

            // GlanceableHubContainerController is only used pre-flexiglass.

            return;

        }

        collectFlow(

                mView,

                mGlanceableHubContainerController.communalAvailable(),

packages/SystemUI/tests/src/com/android/systemui/shade/GlanceableHubContainerControllerTest.kt

+3 −26
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.shade 


import android.graphics.Rect

import android.os.PowerManager

import android.platform.test.flag.junit.FlagsParameterization

import android.testing.AndroidTestingRunner

import android.testing.TestableLooper

import android.testing.ViewUtils

import android.view.MotionEvent
@@ -42,16 +42,12 @@ import com.android.systemui.communal.shared.model.CommunalScenes 
import com.android.systemui.communal.ui.viewmodel.CommunalViewModel

import com.android.systemui.communal.util.CommunalColors

import com.android.systemui.coroutines.collectLastValue

import com.android.systemui.flags.andSceneContainer

import com.android.systemui.keyguard.domain.interactor.keyguardInteractor

import com.android.systemui.keyguard.domain.interactor.keyguardTransitionInteractor

import com.android.systemui.kosmos.Kosmos

import com.android.systemui.kosmos.testDispatcher

import com.android.systemui.kosmos.testScope

import com.android.systemui.res.R

import com.android.systemui.scene.domain.interactor.sceneInteractor

import com.android.systemui.scene.shared.flag.SceneContainerFlag

import com.android.systemui.scene.shared.model.Scenes

import com.android.systemui.scene.shared.model.sceneDataSourceDelegator

import com.android.systemui.shade.domain.interactor.shadeInteractor

import com.android.systemui.statusbar.phone.SystemUIDialogFactory
@@ -71,14 +67,12 @@ import org.mockito.Mock 
import org.mockito.Mockito.times

import org.mockito.Mockito.verify

import org.mockito.MockitoAnnotations

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters



@ExperimentalCoroutinesApi

@RunWith(ParameterizedAndroidJunit4::class)

@RunWith(AndroidTestingRunner::class)

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest

class GlanceableHubContainerControllerTest(flags: FlagsParameterization?) : SysuiTestCase() {

class GlanceableHubContainerControllerTest : SysuiTestCase() {

    private val kosmos: Kosmos =

        testKosmos().apply {

            // UnconfinedTestDispatcher makes testing simpler due to CommunalInteractor flows using
@@ -100,10 +94,6 @@ class GlanceableHubContainerControllerTest(flags: FlagsParameterization?) : Sysu 
    private lateinit var communalRepository: FakeCommunalRepository

    private lateinit var underTest: GlanceableHubContainerController



    init {

        mSetFlagsRule.setFlagsParameterization(flags!!)

    }



    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)
@@ -501,13 +491,6 @@ class GlanceableHubContainerControllerTest(flags: FlagsParameterization?) : Sysu 
    }



    private fun goToScene(scene: SceneKey) {

        if (SceneContainerFlag.isEnabled) {

            if (scene == CommunalScenes.Communal) {

                kosmos.sceneInteractor.changeScene(Scenes.Communal, "test")

            } else {

                kosmos.sceneInteractor.changeScene(Scenes.Lockscreen, "test")

            }

        }

        communalRepository.changeScene(scene)

        testableLooper.processAllMessages()

    }
@@ -536,11 +519,5 @@ class GlanceableHubContainerControllerTest(flags: FlagsParameterization?) : Sysu 
            MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_DOWN, CONTAINER_WIDTH.toFloat(), 0f, 0)

        private val MOVE_EVENT = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_MOVE, 0f, 0f, 0)

        private val UP_EVENT = MotionEvent.obtain(0L, 0L, MotionEvent.ACTION_UP, 0f, 0f, 0)



        @JvmStatic

        @Parameters(name = "{0}")

        fun getParams(): List<FlagsParameterization> {

            return FlagsParameterization.allCombinationsOf().andSceneContainer()

        }

    }

}

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowViewControllerTest.kt

+28 −9
Original line number Diff line number Diff line
@@ -17,12 +17,15 @@ 
package com.android.systemui.shade



import android.content.Context

import android.platform.test.annotations.RequiresFlagsDisabled

import android.platform.test.flag.junit.FlagsParameterization

import android.testing.TestableLooper

import android.testing.TestableLooper.RunWithLooper

import android.view.KeyEvent

import android.view.MotionEvent

import android.view.View

import android.view.ViewGroup

import android.view.ViewTreeObserver

import androidx.test.filters.SmallTest

import com.android.keyguard.KeyguardSecurityContainerController

import com.android.keyguard.LegacyLockIconViewController
@@ -72,7 +75,6 @@ import com.android.systemui.util.mockito.any 
import com.android.systemui.util.mockito.eq

import com.android.systemui.util.time.FakeSystemClock

import com.google.common.truth.Truth.assertThat

import java.util.Optional

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.flow.MutableStateFlow

import kotlinx.coroutines.flow.emptyFlow
@@ -80,12 +82,12 @@ import kotlinx.coroutines.test.TestScope 
import kotlinx.coroutines.test.runTest

import org.junit.Assert.assertEquals

import org.junit.Before

import org.junit.Ignore

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.ArgumentCaptor

import org.mockito.Mock

import org.mockito.Mockito.anyFloat

import org.mockito.Mockito.atLeast

import org.mockito.Mockito.mock

import org.mockito.Mockito.never

import org.mockito.Mockito.times
@@ -93,6 +95,7 @@ import org.mockito.Mockito.verify 
import org.mockito.MockitoAnnotations

import platform.test.runner.parameterized.ParameterizedAndroidJunit4

import platform.test.runner.parameterized.Parameters

import java.util.Optional

import org.mockito.Mockito.`when` as whenever



@OptIn(ExperimentalCoroutinesApi::class)
@@ -152,6 +155,7 @@ class NotificationShadeWindowViewControllerTest(flags: FlagsParameterization?) : 
    private lateinit var underTest: NotificationShadeWindowViewController



    private lateinit var testScope: TestScope

    private lateinit var testableLooper: TestableLooper



    private lateinit var featureFlagsClassic: FakeFeatureFlagsClassic
@@ -181,6 +185,7 @@ class NotificationShadeWindowViewControllerTest(flags: FlagsParameterization?) : 
        mSetFlagsRule.enableFlags(Flags.FLAG_REVAMPED_BOUNCER_MESSAGES)



        testScope = TestScope()

        testableLooper = TestableLooper.get(this)

        falsingCollector = FalsingCollectorFake()

        fakeClock = FakeSystemClock()

        underTest =
@@ -407,6 +412,7 @@ class NotificationShadeWindowViewControllerTest(flags: FlagsParameterization?) : 
    }



    @Test

    @DisableSceneContainer

    fun handleDispatchTouchEvent_glanceableHubIntercepts_returnsTrue() {

        whenever(mGlanceableHubContainerController.onTouchEvent(DOWN_EVENT)).thenReturn(true)

        underTest.setStatusBarViewController(phoneStatusBarViewController)
@@ -559,29 +565,42 @@ class NotificationShadeWindowViewControllerTest(flags: FlagsParameterization?) : 
        }



    @Test

    @Ignore("b/321332798")

    @DisableSceneContainer

    fun setsUpCommunalHubLayout_whenFlagEnabled() {

        whenever(mGlanceableHubContainerController.communalAvailable())

            .thenReturn(MutableStateFlow(true))



        val mockCommunalView = mock(View::class.java)

        val communalView = View(context)

        whenever(mGlanceableHubContainerController.initView(any<Context>()))

                .thenReturn(mockCommunalView)

            .thenReturn(communalView)



        val mockCommunalPlaceholder = mock(View::class.java)

        val fakeViewIndex = 20

        whenever(view.findViewById<View>(R.id.communal_ui_stub)).thenReturn(mockCommunalPlaceholder)

        whenever(view.indexOfChild(mockCommunalPlaceholder)).thenReturn(fakeViewIndex)

        whenever(view.context).thenReturn(context)

        whenever(view.viewTreeObserver).thenReturn(mock(ViewTreeObserver::class.java))



        underTest.setupCommunalHubLayout()



        // Communal view added as a child of the container at the proper index, the stub is removed.

        verify(view).removeView(mockCommunalPlaceholder)

        verify(view).addView(eq(mockCommunalView), eq(fakeViewIndex))

        // Simluate attaching the view so flow collection starts.

        val onAttachStateChangeListenerArgumentCaptor = ArgumentCaptor.forClass(

            View.OnAttachStateChangeListener::class.java

        )

        verify(view, atLeast(1)).addOnAttachStateChangeListener(

            onAttachStateChangeListenerArgumentCaptor.capture()

        )

        for (listener in onAttachStateChangeListenerArgumentCaptor.allValues) {

            listener.onViewAttachedToWindow(view)

        }

        testableLooper.processAllMessages()



        // Communal view added as a child of the container at the proper index.

        verify(view).addView(eq(communalView), eq(fakeViewIndex))

    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_COMMUNAL_HUB)

    fun doesNotSetupCommunalHubLayout_whenFlagDisabled() {

        whenever(mGlanceableHubContainerController.communalAvailable())

                .thenReturn(MutableStateFlow(false))