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

Commit 9fe52e1d authored by Vania Januar's avatar Vania Januar
Browse files

Moving PanelViewController and PanelView to android.systemui.shade. 

As PanelViewController seems very related to
NotificationPanelViewController it might be better for them to live in
the same package. Imports have been updated and the scoping has been
expanded as necessary. This is a follow up from ag/19202451.

Bug: 238333941
Test: atest SystemUITests
Change-Id: Ief8ad6dc74056ab3292b94c191eea0e5d209996c
parent 7023f28b

packages/SystemUI/src/com/android/systemui/camera/CameraGestureHelper.kt

+1 −1
Original line number Diff line number Diff line
@@ -36,7 +36,7 @@ import com.android.systemui.plugins.ActivityStarter 
import com.android.systemui.shared.system.ActivityManagerKt.isInForeground

import com.android.systemui.statusbar.StatusBarState

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

import com.android.systemui.statusbar.phone.PanelViewController

import com.android.systemui.shade.PanelViewController

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

import java.util.concurrent.Executor

import javax.inject.Inject

packages/SystemUI/src/com/android/systemui/dreams/touch/dagger/BouncerSwipeModule.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import com.android.systemui.R; 
import com.android.systemui.dagger.qualifiers.Main;

import com.android.systemui.dreams.touch.BouncerSwipeTouchHandler;

import com.android.systemui.dreams.touch.DreamTouchHandler;

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

import com.android.systemui.shade.PanelViewController;

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



import javax.inject.Named;

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

+0 −1
Original line number Diff line number Diff line
@@ -25,7 +25,6 @@ import android.graphics.PorterDuffXfermode; 
import android.util.AttributeSet;



import com.android.systemui.R;

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

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



public class NotificationPanelView extends PanelView {

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

+0 −2
Original line number Diff line number Diff line
@@ -193,8 +193,6 @@ import com.android.systemui.statusbar.phone.LargeScreenShadeHeaderController; 
import com.android.systemui.statusbar.phone.LockscreenGestureLogger;

import com.android.systemui.statusbar.phone.LockscreenGestureLogger.LockscreenUiEvent;

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

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

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

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

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

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

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

+5 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
 * limitations under the License.

 */



package com.android.systemui.statusbar.phone;

package com.android.systemui.shade;



import android.content.Context;

import android.content.res.Configuration;
@@ -22,6 +22,10 @@ import android.util.AttributeSet; 
import android.view.MotionEvent;

import android.widget.FrameLayout;



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

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

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



public abstract class PanelView extends FrameLayout {

    public static final boolean DEBUG = false;

    public static final String TAG = PanelView.class.getSimpleName();