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

Commit 6f6f8728 authored by Vania Januar's avatar Vania Januar Committed by Android (Google) Code Review
Browse files

Merge "Moving PanelViewController and PanelView to android.systemui.shade." into tm-qpr-dev

parents e373c68b 9fe52e1d

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
@@ -192,8 +192,6 @@ import com.android.systemui.statusbar.phone.KeyguardStatusBarViewController; 
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();