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

Commit dfb6e719 authored by Justin Weir's avatar Justin Weir
Browse files

Move NotificationShadeWindowControllerImpl to the shade package 

Bug: 238333941
Test: atest SystemUITests SystemUIGoogleTests
Change-Id: Idb4385254ebd679ec86aec00da6a43e33469deb2
parent 56b7c817

packages/SystemUI/src/com/android/systemui/dagger/ReferenceSystemUIModule.java

+1 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ import com.android.systemui.qs.tileimpl.QSFactoryImpl; 
import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsImplementation;

import com.android.systemui.screenshot.ReferenceScreenshotModule;

import com.android.systemui.shade.NotificationShadeWindowControllerImpl;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeControllerImpl;

import com.android.systemui.statusbar.CommandQueue;
@@ -59,7 +60,6 @@ import com.android.systemui.statusbar.phone.DozeServiceHost; 
import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;

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

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

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

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

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

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

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowControllerImpl.java→packages/SystemUI/src/com/android/systemui/shade/NotificationShadeWindowControllerImpl.java

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

 * Copyright (C) 2020 The Android Open Source Project

 * Copyright (C) 2022 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.statusbar.phone;

package com.android.systemui.shade;



import static android.view.WindowInsetsController.BEHAVIOR_SHOW_TRANSIENT_BARS_BY_SWIPE;

import static android.view.WindowManager.LayoutParams.LAYOUT_IN_DISPLAY_CUTOUT_MODE_ALWAYS;
@@ -60,6 +60,12 @@ import com.android.systemui.plugins.statusbar.StatusBarStateController.StateList 
import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.StatusBarState;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

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

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

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

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

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

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

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

import com.android.systemui.statusbar.policy.ConfigurationController.ConfigurationListener;

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

packages/SystemUI/src/com/android/systemui/tv/TvSystemUIModule.java

+1 −1
Original line number Diff line number Diff line
@@ -47,6 +47,7 @@ import com.android.systemui.qs.tileimpl.QSFactoryImpl; 
import com.android.systemui.recents.Recents;

import com.android.systemui.recents.RecentsImplementation;

import com.android.systemui.screenshot.ReferenceScreenshotModule;

import com.android.systemui.shade.NotificationShadeWindowControllerImpl;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shade.ShadeControllerImpl;

import com.android.systemui.statusbar.CommandQueue;
@@ -61,7 +62,6 @@ import com.android.systemui.statusbar.phone.DozeServiceHost; 
import com.android.systemui.statusbar.phone.HeadsUpManagerPhone;

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

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

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

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

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

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

packages/SystemUI/tests/src/com/android/systemui/shade/NotificationShadeWindowControllerImplTest.java

+0 −1
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ import com.android.systemui.keyguard.KeyguardViewMediator; 
import com.android.systemui.statusbar.SysuiStatusBarStateController;

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

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

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

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

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

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

packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java

+1 −1
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ import com.android.systemui.dump.DumpManager; 
import com.android.systemui.keyguard.KeyguardViewMediator;

import com.android.systemui.model.SysUiState;

import com.android.systemui.plugins.statusbar.StatusBarStateController;

import com.android.systemui.shade.NotificationShadeWindowControllerImpl;

import com.android.systemui.shade.NotificationShadeWindowView;

import com.android.systemui.shade.ShadeController;

import com.android.systemui.shared.system.QuickStepContract;
@@ -106,7 +107,6 @@ import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow 
import com.android.systemui.statusbar.notification.row.NotificationTestHelper;

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

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

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

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

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

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