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

Commit 16d7bba6 authored by Caitlin Cassidy's avatar Caitlin Cassidy Committed by Android (Google) Code Review
Browse files

Merge "[Status Bar Refactor] Remove some cruft from NotificationShadeWindowViewController."

parents 42739c0b 2e62e046

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationShadeWindowViewController.java

+4 −58
Original line number Diff line number Diff line
@@ -39,24 +39,14 @@ import com.android.keyguard.LockIconViewController; 
import com.android.systemui.R;

import com.android.systemui.classifier.FalsingCollector;

import com.android.systemui.dock.DockManager;

import com.android.systemui.doze.DozeLog;

import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.DragDownHelper;

import com.android.systemui.statusbar.LockscreenShadeTransitionController;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.PulseExpansionHandler;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.notification.DynamicPrivacyController;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;

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

import com.android.systemui.statusbar.window.StatusBarWindowController;

import com.android.systemui.tuner.TunerService;



import java.io.FileDescriptor;
@@ -69,22 +59,10 @@ import javax.inject.Inject; 
 */

public class NotificationShadeWindowViewController {

    private static final String TAG = "NotifShadeWindowVC";

    private final NotificationWakeUpCoordinator mCoordinator;

    private final PulseExpansionHandler mPulseExpansionHandler;

    private final DynamicPrivacyController mDynamicPrivacyController;

    private final KeyguardBypassController mBypassController;

    private final PluginManager mPluginManager;

    private final FalsingCollector mFalsingCollector;

    private final TunerService mTunerService;

    private final NotificationLockscreenUserManager mNotificationLockscreenUserManager;

    private final NotificationEntryManager mNotificationEntryManager;

    private final KeyguardStateController mKeyguardStateController;

    private final SysuiStatusBarStateController mStatusBarStateController;

    private final DozeLog mDozeLog;

    private final DozeParameters mDozeParameters;

    private final CommandQueue mCommandQueue;

    private final NotificationShadeWindowView mView;

    private final ShadeController mShadeController;

    private final NotificationShadeDepthController mDepthController;

    private final NotificationStackScrollLayoutController mNotificationStackScrollLayoutController;

    private final LockscreenShadeTransitionController mLockscreenShadeTransitionController;
@@ -107,62 +85,34 @@ public class NotificationShadeWindowViewController { 
    private final DockManager mDockManager;

    private final NotificationPanelViewController mNotificationPanelViewController;

    private final PanelExpansionStateManager mPanelExpansionStateManager;

    private final StatusBarWindowController mStatusBarWindowController;



    // Used for determining view / touch intersection

    private int[] mTempLocation = new int[2];

    private RectF mTempRect = new RectF();

    private final RectF mTempRect = new RectF();

    private boolean mIsTrackingBarGesture = false;



    @Inject

    public NotificationShadeWindowViewController(

            NotificationWakeUpCoordinator coordinator,

            PulseExpansionHandler pulseExpansionHandler,

            DynamicPrivacyController dynamicPrivacyController,

            KeyguardBypassController bypassController,

            LockscreenShadeTransitionController transitionController,

            FalsingCollector falsingCollector,

            PluginManager pluginManager,

            TunerService tunerService,

            NotificationLockscreenUserManager notificationLockscreenUserManager,

            NotificationEntryManager notificationEntryManager,

            KeyguardStateController keyguardStateController,

            SysuiStatusBarStateController statusBarStateController,

            DozeLog dozeLog,

            DozeParameters dozeParameters,

            CommandQueue commandQueue,

            ShadeController shadeController,

            DockManager dockManager,

            NotificationShadeDepthController depthController,

            NotificationShadeWindowView notificationShadeWindowView,

            NotificationPanelViewController notificationPanelViewController,

            PanelExpansionStateManager panelExpansionStateManager,

            StatusBarWindowController statusBarWindowController,

            NotificationStackScrollLayoutController notificationStackScrollLayoutController,

            StatusBarKeyguardViewManager statusBarKeyguardViewManager,

            LockIconViewController lockIconViewController) {

        mCoordinator = coordinator;

        mPulseExpansionHandler = pulseExpansionHandler;

        mDynamicPrivacyController = dynamicPrivacyController;

        mBypassController = bypassController;

        mLockscreenShadeTransitionController = transitionController;

        mFalsingCollector = falsingCollector;

        mPluginManager = pluginManager;

        mTunerService = tunerService;

        mNotificationLockscreenUserManager = notificationLockscreenUserManager;

        mNotificationEntryManager = notificationEntryManager;

        mKeyguardStateController = keyguardStateController;

        mStatusBarStateController = statusBarStateController;

        mDozeLog = dozeLog;

        mDozeParameters = dozeParameters;

        mCommandQueue = commandQueue;

        mView = notificationShadeWindowView;

        mShadeController = shadeController;

        mDockManager = dockManager;

        mNotificationPanelViewController = notificationPanelViewController;

        mPanelExpansionStateManager = panelExpansionStateManager;

        mDepthController = depthController;

        mStatusBarWindowController = statusBarWindowController;

        mNotificationStackScrollLayoutController = notificationStackScrollLayoutController;

        mStatusBarKeyguardViewManager = statusBarKeyguardViewManager;

        mLockIconViewController = lockIconViewController;
@@ -247,11 +197,11 @@ public class NotificationShadeWindowViewController { 
                }



                if (isDown) {

                    setTouchActive(true);

                    mTouchActive = true;

                    mTouchCancelled = false;

                } else if (ev.getActionMasked() == MotionEvent.ACTION_UP

                        || ev.getActionMasked() == MotionEvent.ACTION_CANCEL) {

                    setTouchActive(false);

                    mTouchActive = false;

                }

                if (mTouchCancelled || mExpandAnimationRunning) {

                    return false;
@@ -458,10 +408,6 @@ public class NotificationShadeWindowViewController { 
        return mView;

    }



    public void setTouchActive(boolean touchActive) {

        mTouchActive = touchActive;

    }



    public void cancelCurrentTouch() {

        if (mTouchActive) {

            final long now = SystemClock.uptimeMillis();
@@ -511,7 +457,7 @@ public class NotificationShadeWindowViewController { 
    }



    private boolean isIntersecting(View view, float x, float y) {

        mTempLocation = view.getLocationOnScreen();

        int[] mTempLocation = view.getLocationOnScreen();

        mTempRect.set(mTempLocation[0], mTempLocation[1], mTempLocation[0] + view.getWidth(),

                mTempLocation[1] + view.getHeight());

        return mTempRect.contains(x, y);

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/NotificationShadeWindowViewTest.java

+0 −34
Original line number Diff line number Diff line
@@ -37,24 +37,14 @@ import com.android.systemui.R; 
import com.android.systemui.SysuiTestCase;

import com.android.systemui.classifier.FalsingCollectorFake;

import com.android.systemui.dock.DockManager;

import com.android.systemui.doze.DozeLog;

import com.android.systemui.shared.plugins.PluginManager;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.DragDownHelper;

import com.android.systemui.statusbar.LockscreenShadeTransitionController;

import com.android.systemui.statusbar.NotificationLockscreenUserManager;

import com.android.systemui.statusbar.NotificationShadeDepthController;

import com.android.systemui.statusbar.NotificationShadeWindowController;

import com.android.systemui.statusbar.PulseExpansionHandler;

import com.android.systemui.statusbar.SysuiStatusBarStateController;

import com.android.systemui.statusbar.notification.DynamicPrivacyController;

import com.android.systemui.statusbar.notification.NotificationEntryManager;

import com.android.systemui.statusbar.notification.NotificationWakeUpCoordinator;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;

import com.android.systemui.statusbar.phone.panelstate.PanelExpansionStateManager;

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

import com.android.systemui.statusbar.window.StatusBarWindowController;

import com.android.systemui.tuner.TunerService;



import org.junit.Before;
@@ -73,26 +63,15 @@ public class NotificationShadeWindowViewTest extends SysuiTestCase { 
    private NotificationShadeWindowView mView;

    private NotificationShadeWindowViewController mController;



    @Mock private NotificationWakeUpCoordinator mCoordinator;

    @Mock private PulseExpansionHandler mPulseExpansionHandler;

    @Mock private DynamicPrivacyController mDynamicPrivacyController;

    @Mock private KeyguardBypassController mBypassController;

    @Mock private PluginManager mPluginManager;

    @Mock private TunerService mTunerService;

    @Mock private DragDownHelper mDragDownHelper;

    @Mock private KeyguardStateController mKeyguardStateController;

    @Mock private SysuiStatusBarStateController mStatusBarStateController;

    @Mock private ShadeController mShadeController;

    @Mock private NotificationLockscreenUserManager mNotificationLockScreenUserManager;

    @Mock private NotificationEntryManager mNotificationEntryManager;

    @Mock private StatusBar mStatusBar;

    @Mock private DozeLog mDozeLog;

    @Mock private DozeParameters mDozeParameters;

    @Mock private DockManager mDockManager;

    @Mock private NotificationPanelViewController mNotificationPanelViewController;

    @Mock private NotificationStackScrollLayout mNotificationStackScrollLayout;

    @Mock private NotificationShadeDepthController mNotificationShadeDepthController;

    @Mock private StatusBarWindowController mStatusBarWindowController;

    @Mock private NotificationShadeWindowController mNotificationShadeWindowController;

    @Mock private NotificationStackScrollLayoutController mNotificationStackScrollLayoutController;

    @Mock private StatusBarKeyguardViewManager mStatusBarKeyguardViewManager;
@@ -117,28 +96,15 @@ public class NotificationShadeWindowViewTest extends SysuiTestCase { 
        when(mDockManager.isDocked()).thenReturn(false);



        mController = new NotificationShadeWindowViewController(

                mCoordinator,

                mPulseExpansionHandler,

                mDynamicPrivacyController,

                mBypassController,

                mLockscreenShadeTransitionController,

                new FalsingCollectorFake(),

                mPluginManager,

                mTunerService,

                mNotificationLockScreenUserManager,

                mNotificationEntryManager,

                mKeyguardStateController,

                mStatusBarStateController,

                mDozeLog,

                mDozeParameters,

                new CommandQueue(mContext),

                mShadeController,

                mDockManager,

                mNotificationShadeDepthController,

                mView,

                mNotificationPanelViewController,

                new PanelExpansionStateManager(),

                mStatusBarWindowController,

                mNotificationStackScrollLayoutController,

                mStatusBarKeyguardViewManager,

                mLockIconViewController);