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

Commit 042ef941 authored by Bryce Lee's avatar Bryce Lee
Browse files

Move touch classes out of dream package. 

This change moves touch-related functionality out of the dream touch
package and into the ambient touch package.

Test: atest TouchMonitorTest
Test: atest BouncerlessScrimControllerTest
Test: atest ScrimManagerTest
Test: atest BouncerSwipeTouchHandlerTest
Test: atest CommunalTouchHandlerTest
Test: atest ShadeTouchHandlerTest
Test: atest DreamOverlayServiceTest
Flag: N/A
Bug: 333885071
Change-Id: Ib812ec5f8ec2cd71507b0c4938849503e7518b8d
parent 1684cdbe

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

+4 −4
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;

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

packages/SystemUI/multivalentTests/src/com/android/systemui/dreams/touch/ShadeTouchHandlerTest.java→packages/SystemUI/multivalentTests/src/com/android/systemui/ambient/touch/ShadeTouchHandlerTest.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.
@@ -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;

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;