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

Commit 1eb86347 authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge changes I4ca69b60,Ib812ec5f,Id34da575,I3d19d4c7 into main 

* changes:
  Only use CommunalTouchHandler for Dream Overlay.
  Move touch classes out of dream package.
  Rename Touch classes.
  Refactor touch handling out of dreams
parents 8485ff6f 9fc3ffe0

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

+8 −8
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 The Android Open Source Project

 * 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.dreams.touch;

package com.android.systemui.ambient.touch;



import static com.google.common.truth.Truth.assertThat;
@@ -45,9 +45,9 @@ import com.android.internal.logging.UiEventLogger; 
import com.android.internal.widget.LockPatternUtils;

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.bouncer.shared.constants.KeyguardBouncerConstants;

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

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

import com.android.systemui.settings.FakeUserTracker;

import com.android.systemui.shade.ShadeExpansionChangeEvent;

import com.android.systemui.shared.system.InputChannelCompat;
@@ -88,7 +88,7 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { 
    FlingAnimationUtils mFlingAnimationUtilsClosing;



    @Mock

    DreamTouchHandler.TouchSession mTouchSession;

    TouchHandler.TouchSession mTouchSession;



    BouncerSwipeTouchHandler mTouchHandler;
@@ -258,7 +258,7 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { 
    }



    private static void onSessionStartHelper(BouncerSwipeTouchHandler touchHandler,

            DreamTouchHandler.TouchSession touchSession,

            TouchHandler.TouchSession touchSession,

            NotificationShadeWindowController notificationShadeWindowController) {

        touchHandler.onSessionStart(touchSession);

        verify(notificationShadeWindowController).setForcePluginOpen(eq(true), any());
@@ -677,8 +677,8 @@ public class BouncerSwipeTouchHandlerTest extends SysuiTestCase { 
    @Test

    public void testTouchSessionOnRemovedCalledTwice() {

        mTouchHandler.onSessionStart(mTouchSession);

        ArgumentCaptor<DreamTouchHandler.TouchSession.Callback> onRemovedCallbackCaptor =

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

        ArgumentCaptor<TouchHandler.TouchSession.Callback> onRemovedCallbackCaptor =

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

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

        onRemovedCallbackCaptor.getValue().onRemoved();

        onRemovedCallbackCaptor.getValue().onRemoved();

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/ShadeTouchHandlerTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/ShadeTouchHandlerTest.java

+3 −3
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 * 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.
@@ -13,7 +13,7 @@ 
 * See the License for the specific language governing permissions and

 * limitations under the License.

 */

package com.android.systemui.dreams.touch;

package com.android.systemui.ambient.touch;





import static com.google.common.truth.Truth.assertThat;
@@ -52,7 +52,7 @@ public class ShadeTouchHandlerTest extends SysuiTestCase { 
    ShadeViewController mShadeViewController;



    @Mock

    DreamTouchHandler.TouchSession mTouchSession;

    TouchHandler.TouchSession mTouchSession;



    ShadeTouchHandler mTouchHandler;

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/scrim/BouncerlessScrimControllerTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/scrim/BouncerlessScrimControllerTest.java

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 * 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.dreams.touch.scrim;

package com.android.systemui.ambient.touch.scrim;



import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyLong;

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/scrim/ScrimManagerTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/scrim/ScrimManagerTest.java

+2 −2
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 * 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.
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.dreams.touch.scrim;

package com.android.systemui.ambient.touch.scrim;



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

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -39,10 +39,10 @@ import androidx.test.filters.SmallTest; 
import com.android.dream.lowlight.LowLightTransitionCoordinator;

import com.android.keyguard.BouncerPanelExpansionCalculator;

import com.android.systemui.SysuiTestCase;

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

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor;

import com.android.systemui.bouncer.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback;

import com.android.systemui.complication.ComplicationHostViewController;

import com.android.systemui.dreams.touch.scrim.BouncerlessScrimController;

import com.android.systemui.statusbar.BlurUtils;



import org.junit.Before;