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

Commit 122c10f8 authored by William Xiao's avatar William Xiao Committed by Android (Google) Code Review
Browse files

Merge changes I788f8f17,Ie21c8132 into main 

* changes:
  Fix shade jumping back and forth when opening on shade/hub
  Clean up hubmode_fullscreen_vertical_swipe_fix flag
parents 19bbe3ef dbdc68c5

packages/SystemUI/aconfig/systemui.aconfig

+0 −21
Original line number Diff line number Diff line
@@ -1547,27 +1547,6 @@ flag { 
  bug: "352600066"

}



flag {

  name: "hubmode_fullscreen_vertical_swipe"

  namespace: "systemui"

  description: "Enables fullscreen vertical swiping in hub mode to bring up and down the bouncer and shade"

  bug: "340177049"

  metadata {

      purpose: PURPOSE_BUGFIX

  }

}



flag {

  name: "hubmode_fullscreen_vertical_swipe_fix"

  namespace: "systemui"

  description: "Bug fix that enables fullscreen vertical swiping in hub mode to bring up and down the bouncer and shade"

  bug: "340177049"

  metadata {

      purpose: PURPOSE_BUGFIX

  }

}





flag {

   namespace: "systemui"

   name: "remove_update_listener_in_qs_icon_view_impl"

packages/SystemUI/compose/features/src/com/android/systemui/communal/ui/compose/CommunalHub.kt

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ fun CommunalHub( 
                    }

                }

                // Nested scroll for full screen swipe to get to shade and bouncer

                .thenIf(!viewModel.isEditMode && Flags.hubmodeFullscreenVerticalSwipeFix()) {

                .thenIf(!viewModel.isEditMode) {

                    Modifier.nestedScroll(nestedScrollConnection).pointerInput(viewModel) {

                        awaitPointerEventScope {

                            while (true) {

packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/BouncerFullscreenSwipeTouchHandlerTest.java

deleted100644 → 0
+0 −318
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.ambient.touch;



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



import static kotlinx.coroutines.flow.StateFlowKt.MutableStateFlow;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyFloat;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.animation.ValueAnimator;

import android.content.pm.UserInfo;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.graphics.Rect;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

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

import android.view.GestureDetector;

import android.view.GestureDetector.OnGestureListener;

import android.view.MotionEvent;

import android.view.VelocityTracker;



import androidx.test.filters.SmallTest;



import com.android.internal.logging.UiEventLogger;

import com.android.systemui.Flags;

import com.android.systemui.SysuiTestCase;

import com.android.systemui.ambient.touch.scrim.ScrimController;

import com.android.systemui.ambient.touch.scrim.ScrimManager;

import com.android.systemui.communal.ui.viewmodel.CommunalViewModel;

import com.android.systemui.flags.SceneContainerFlagParameterizationKt;

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor;

import com.android.systemui.kosmos.KosmosJavaAdapter;

import com.android.systemui.plugins.ActivityStarter;

import com.android.systemui.scene.domain.interactor.SceneInteractor;

import com.android.systemui.scene.ui.view.WindowRootView;

import com.android.systemui.shared.system.InputChannelCompat;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.policy.KeyguardStateController;

import com.android.wm.shell.animation.FlingAnimationUtils;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;

import org.mockito.Mock;

import org.mockito.Mockito;

import org.mockito.MockitoAnnotations;



import platform.test.runner.parameterized.ParameterizedAndroidJunit4;

import platform.test.runner.parameterized.Parameters;



import java.util.List;

import java.util.Optional;



@SmallTest

@RunWith(ParameterizedAndroidJunit4.class)

@EnableFlags(Flags.FLAG_HUBMODE_FULLSCREEN_VERTICAL_SWIPE_FIX)

@DisableFlags(Flags.FLAG_COMMUNAL_BOUNCER_DO_NOT_MODIFY_PLUGIN_OPEN)

public class BouncerFullscreenSwipeTouchHandlerTest extends SysuiTestCase {

    private KosmosJavaAdapter mKosmos;



    @Mock

    CentralSurfaces mCentralSurfaces;



    @Mock

    ScrimManager mScrimManager;



    @Mock

    ScrimController mScrimController;



    @Mock

    NotificationShadeWindowController mNotificationShadeWindowController;



    @Mock

    FlingAnimationUtils mFlingAnimationUtils;



    @Mock

    FlingAnimationUtils mFlingAnimationUtilsClosing;



    @Mock

    TouchHandler.TouchSession mTouchSession;



    BouncerSwipeTouchHandler mTouchHandler;



    @Mock

    BouncerSwipeTouchHandler.ValueAnimatorCreator mValueAnimatorCreator;



    @Mock

    ValueAnimator mValueAnimator;



    @Mock

    BouncerSwipeTouchHandler.VelocityTrackerFactory mVelocityTrackerFactory;



    @Mock

    VelocityTracker mVelocityTracker;



    @Mock

    UiEventLogger mUiEventLogger;



    @Mock

    ActivityStarter mActivityStarter;



    @Mock

    CommunalViewModel mCommunalViewModel;



    @Mock

    KeyguardInteractor mKeyguardInteractor;



    @Mock

    WindowRootView mWindowRootView;



    @Mock

    Resources mResources;



    private SceneInteractor mSceneInteractor;



    private KeyguardStateController mKeyguardStateController;



    private static final float TOUCH_REGION = .3f;

    private static final float MIN_BOUNCER_HEIGHT = .05f;

    private final Configuration mConfiguration = new Configuration();



    private static final Rect SCREEN_BOUNDS = new Rect(0, 0, 1024, 100);

    private static final UserInfo CURRENT_USER_INFO = new UserInfo(

            10,

            /* name= */ "user10",

            /* flags= */ 0

    );



    @Parameters(name = "{0}")

    public static List<FlagsParameterization> getParams() {

        return SceneContainerFlagParameterizationKt.parameterizeSceneContainerFlag();

    }



    public BouncerFullscreenSwipeTouchHandlerTest(FlagsParameterization flags) {

        super();

        mSetFlagsRule.setFlagsParameterization(flags);

    }



    @Before

    public void setup() {

        mKosmos = new KosmosJavaAdapter(this);

        mSceneInteractor = spy(mKosmos.getSceneInteractor());

        mKeyguardStateController = mKosmos.getKeyguardStateController();

        mConfiguration.orientation = Configuration.ORIENTATION_PORTRAIT;



        MockitoAnnotations.initMocks(this);

        mTouchHandler = new BouncerSwipeTouchHandler(

                mKosmos.getTestScope(),

                mScrimManager,

                Optional.of(mCentralSurfaces),

                mNotificationShadeWindowController,

                mValueAnimatorCreator,

                mVelocityTrackerFactory,

                mCommunalViewModel,

                mFlingAnimationUtils,

                mFlingAnimationUtilsClosing,

                TOUCH_REGION,

                MIN_BOUNCER_HEIGHT,

                mUiEventLogger,

                mActivityStarter,

                mKeyguardInteractor,

                mSceneInteractor,

                mKosmos.getShadeRepository(),

                Optional.of(() -> mWindowRootView),

                mKeyguardStateController,

                mKosmos.getCommunalSettingsInteractor());



        when(mScrimManager.getCurrentController()).thenReturn(mScrimController);

        when(mValueAnimatorCreator.create(anyFloat(), anyFloat())).thenReturn(mValueAnimator);

        when(mVelocityTrackerFactory.obtain()).thenReturn(mVelocityTracker);

        when(mFlingAnimationUtils.getMinVelocityPxPerSecond()).thenReturn(Float.MAX_VALUE);

        when(mTouchSession.getBounds()).thenReturn(SCREEN_BOUNDS);

        when(mKeyguardInteractor.isKeyguardDismissible()).thenReturn(MutableStateFlow(false));

        when(mKeyguardStateController.isKeyguardScreenRotationAllowed()).thenReturn(true);

        when(mWindowRootView.getResources()).thenReturn(mResources);

        when(mResources.getConfiguration()).thenReturn(mConfiguration);

    }



    /**

     * Makes sure that touches go to the scene container when the flag is on.

     */

    @Test

    @EnableFlags(Flags.FLAG_SCENE_CONTAINER)

    public void testSwipeUp_sendsTouchesToWindowRootView() {

        mTouchHandler.onGlanceableTouchAvailable(true);

        mTouchHandler.onSessionStart(mTouchSession);

        ArgumentCaptor<GestureDetector.OnGestureListener> gestureListenerCaptor =

                ArgumentCaptor.forClass(GestureDetector.OnGestureListener.class);

        verify(mTouchSession).registerGestureListener(gestureListenerCaptor.capture());



        final OnGestureListener gestureListener = gestureListenerCaptor.getValue();



        final int screenHeight = 100;

        final float distanceY = screenHeight * 0.42f;



        final MotionEvent event1 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE,

                0, screenHeight, 0);

        final MotionEvent event2 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE,

                0, screenHeight - distanceY, 0);



        assertThat(gestureListener.onScroll(event1, event2, 0,

                distanceY))

                .isTrue();



        // Ensure only called once

        verify(mSceneInteractor).onRemoteUserInputStarted(any());

        verify(mWindowRootView).dispatchTouchEvent(event1);

        verify(mWindowRootView).dispatchTouchEvent(event2);

    }



    /**

     * Ensures expansion does not happen for full vertical swipes when touch is not available.

     */

    @Test

    public void testFullSwipe_notInitiatedWhenNotAvailable() {

        mTouchHandler.onGlanceableTouchAvailable(false);

        mTouchHandler.onSessionStart(mTouchSession);

        ArgumentCaptor<OnGestureListener> gestureListenerCaptor =

                ArgumentCaptor.forClass(OnGestureListener.class);

        verify(mTouchSession).registerGestureListener(gestureListenerCaptor.capture());



        // A touch within range at the bottom of the screen should trigger listening

        assertThat(gestureListenerCaptor.getValue()

                .onScroll(Mockito.mock(MotionEvent.class),

                        Mockito.mock(MotionEvent.class),

                        1,

                        2)).isFalse();

    }



    /**

     * Ensures expansion only happens for full vertical swipes when touch is available.

     */

    @Test

    public void testFullSwipe_initiatedWhenAvailable() {

        mTouchHandler.onGlanceableTouchAvailable(true);

        mTouchHandler.onSessionStart(mTouchSession);

        ArgumentCaptor<OnGestureListener> gestureListenerCaptor =

                ArgumentCaptor.forClass(OnGestureListener.class);

        verify(mTouchSession).registerGestureListener(gestureListenerCaptor.capture());



        // A touch within range at the bottom of the screen should trigger listening

        assertThat(gestureListenerCaptor.getValue()

                .onScroll(Mockito.mock(MotionEvent.class),

                        Mockito.mock(MotionEvent.class),

                        1,

                        2)).isTrue();

    }



    @Test

    public void testFullSwipe_motionUpResetsTouchState() {

        mTouchHandler.onGlanceableTouchAvailable(true);

        mTouchHandler.onSessionStart(mTouchSession);

        ArgumentCaptor<OnGestureListener> gestureListenerCaptor =

                ArgumentCaptor.forClass(OnGestureListener.class);

        ArgumentCaptor<InputChannelCompat.InputEventListener> inputListenerCaptor =

                ArgumentCaptor.forClass(InputChannelCompat.InputEventListener.class);

        verify(mTouchSession).registerGestureListener(gestureListenerCaptor.capture());

        verify(mTouchSession).registerInputListener(inputListenerCaptor.capture());



        // A touch within range at the bottom of the screen should trigger listening

        assertThat(gestureListenerCaptor.getValue()

                .onScroll(Mockito.mock(MotionEvent.class),

                        Mockito.mock(MotionEvent.class),

                        1,

                        2)).isTrue();



        MotionEvent upEvent = Mockito.mock(MotionEvent.class);

        when(upEvent.getAction()).thenReturn(MotionEvent.ACTION_UP);

        inputListenerCaptor.getValue().onInputEvent(upEvent);

        verify(mCommunalViewModel).onResetTouchState();

    }



    @Test

    public void testFullSwipe_motionCancelResetsTouchState() {

        mTouchHandler.onGlanceableTouchAvailable(true);

        mTouchHandler.onSessionStart(mTouchSession);

        ArgumentCaptor<OnGestureListener> gestureListenerCaptor =

                ArgumentCaptor.forClass(OnGestureListener.class);

        ArgumentCaptor<InputChannelCompat.InputEventListener> inputListenerCaptor =

                ArgumentCaptor.forClass(InputChannelCompat.InputEventListener.class);

        verify(mTouchSession).registerGestureListener(gestureListenerCaptor.capture());

        verify(mTouchSession).registerInputListener(inputListenerCaptor.capture());



        // A touch within range at the bottom of the screen should trigger listening

        assertThat(gestureListenerCaptor.getValue()

                .onScroll(Mockito.mock(MotionEvent.class),

                        Mockito.mock(MotionEvent.class),

                        1,

                        2)).isTrue();



        MotionEvent upEvent = Mockito.mock(MotionEvent.class);

        when(upEvent.getAction()).thenReturn(MotionEvent.ACTION_CANCEL);

        inputListenerCaptor.getValue().onInputEvent(upEvent);

        verify(mCommunalViewModel).onResetTouchState();

    }

}

packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/BouncerSwipeTouchHandlerTest.java

+98 −4
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ import java.util.Optional; 


@SmallTest

@RunWith(ParameterizedAndroidJunit4.class)

@DisableFlags(Flags.FLAG_HUBMODE_FULLSCREEN_VERTICAL_SWIPE_FIX)

public class BouncerSwipeTouchHandlerTest extends SysuiTestCase {

    private KosmosJavaAdapter mKosmos;

    @Mock
@@ -221,6 +220,9 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { 
        when(mKeyguardStateController.isKeyguardScreenRotationAllowed()).thenReturn(true);

        when(mWindowRootView.getResources()).thenReturn(mResources);

        setCommunalV2ConfigEnabled(true);



        // Indicate touches are available.

        mTouchHandler.onGlanceableTouchAvailable(true);

    }



    /**
@@ -389,6 +391,26 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { 
        verify(mScrimController, never()).expand(any());

    }



    /**

     * Ensures expansion does not happen for swipes when touch is not available.

     */

    @Test

    public void testSwipe_hubTouchNotAvailable_notInitiated() {

        // Hub touch is not available.

        mTouchHandler.onGlanceableTouchAvailable(false);

        mTouchHandler.onSessionStart(mTouchSession);

        ArgumentCaptor<OnGestureListener> gestureListenerCaptor =

                ArgumentCaptor.forClass(OnGestureListener.class);

        verify(mTouchSession).registerGestureListener(gestureListenerCaptor.capture());



        // A touch within range at the bottom of the screen should trigger listening.

        assertThat(gestureListenerCaptor.getValue()

                .onScroll(Mockito.mock(MotionEvent.class),

                        Mockito.mock(MotionEvent.class),

                        1,

                        2)).isFalse();

    }



    /**

     * Makes sure swiping down when bouncer initially hidden doesn't change the expansion amount.

     */
@@ -690,21 +712,93 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { 
    }



    @Test

    public void testTouchSessionStart_notifiesShadeOfUserInteraction() {

        mTouchHandler.onSessionStart(mTouchSession);



    public void testSwipeUp_notifiesShadeOfUserInteraction() {

        // Start a swipe up gesture that will open the bouncer.

        final float swipeUpPercentage = .3f;

        final float velocityY = -1;

        swipeToPosition(swipeUpPercentage, velocityY);

        mKosmos.getTestScope().getTestScheduler().runCurrent();

        assertThat(mKosmos.getShadeRepository().getLegacyShadeTracking().getValue()).isTrue();



        // End touch session.

        ArgumentCaptor<TouchHandler.TouchSession.Callback> onRemovedCallbackCaptor =

                ArgumentCaptor.forClass(TouchHandler.TouchSession.Callback.class);

        verify(mTouchSession).registerCallback(onRemovedCallbackCaptor.capture());

        onRemovedCallbackCaptor.getValue().onRemoved();

        mKosmos.getTestScope().getTestScheduler().runCurrent();



        // Shade notified that the tracking stops.

        assertThat(mKosmos.getShadeRepository().getLegacyShadeTracking().getValue()).isFalse();

    }



    @Test

    public void testSwipeDown_doesNotNotifYShadeOfUserInteraction() {

        mTouchHandler.onSessionStart(mTouchSession);



        final float percent = .15f;

        final float distanceY = SCREEN_HEIGHT_PX * percent;



        // Swiping down, which will not open the bouncer.

        final MotionEvent event1 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE,

                0, SCREEN_HEIGHT_PX - distanceY, 0);

        final MotionEvent event2 = MotionEvent.obtain(0, 0, MotionEvent.ACTION_MOVE,

                0, SCREEN_HEIGHT_PX, 0);



        // Shade is not notified since swipe is not captured.

        mKosmos.getTestScope().getTestScheduler().runCurrent();

        assertThat(mKosmos.getShadeRepository().getLegacyShadeTracking().getValue()).isFalse();

    }



    // Verifies that communal touch state is reset when gesture ends in ACTION_UP.

    @Test

    public void testFullSwipe_motionUpResetsTouchState() {

        mTouchHandler.onGlanceableTouchAvailable(true);

        mTouchHandler.onSessionStart(mTouchSession);

        ArgumentCaptor<OnGestureListener> gestureListenerCaptor =

                ArgumentCaptor.forClass(OnGestureListener.class);

        ArgumentCaptor<InputChannelCompat.InputEventListener> inputListenerCaptor =

                ArgumentCaptor.forClass(InputChannelCompat.InputEventListener.class);

        verify(mTouchSession).registerGestureListener(gestureListenerCaptor.capture());

        verify(mTouchSession).registerInputListener(inputListenerCaptor.capture());



        // A touch within range at the bottom of the screen should trigger listening

        assertThat(gestureListenerCaptor.getValue()

                .onScroll(Mockito.mock(MotionEvent.class),

                        Mockito.mock(MotionEvent.class),

                        1,

                        2)).isTrue();



        MotionEvent upEvent = Mockito.mock(MotionEvent.class);

        when(upEvent.getAction()).thenReturn(MotionEvent.ACTION_UP);

        inputListenerCaptor.getValue().onInputEvent(upEvent);

        verify(mCommunalViewModel).onResetTouchState();

    }



    // Verifies that communal touch state is reset when gesture ends in ACTION_CANCEL.

    @Test

    public void testFullSwipe_motionCancelResetsTouchState() {

        mTouchHandler.onGlanceableTouchAvailable(true);

        mTouchHandler.onSessionStart(mTouchSession);

        ArgumentCaptor<OnGestureListener> gestureListenerCaptor =

                ArgumentCaptor.forClass(OnGestureListener.class);

        ArgumentCaptor<InputChannelCompat.InputEventListener> inputListenerCaptor =

                ArgumentCaptor.forClass(InputChannelCompat.InputEventListener.class);

        verify(mTouchSession).registerGestureListener(gestureListenerCaptor.capture());

        verify(mTouchSession).registerInputListener(inputListenerCaptor.capture());



        // A touch within range at the bottom of the screen should trigger listening

        assertThat(gestureListenerCaptor.getValue()

                .onScroll(Mockito.mock(MotionEvent.class),

                        Mockito.mock(MotionEvent.class),

                        1,

                        2)).isTrue();



        MotionEvent upEvent = Mockito.mock(MotionEvent.class);

        when(upEvent.getAction()).thenReturn(MotionEvent.ACTION_CANCEL);

        inputListenerCaptor.getValue().onInputEvent(upEvent);

        verify(mCommunalViewModel).onResetTouchState();

    }



    private void swipeToPosition(float percent, float velocityY) {

        Mockito.clearInvocations(mTouchSession);

        mTouchHandler.onSessionStart(mTouchSession);

packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/ShadeTouchHandlerTest.kt

+17 −46

File changed.

Preview size limit exceeded, changes collapsed.