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

Commit fca9e25a authored by Tracy Zhou's avatar Tracy Zhou Committed by Automerger Merge Worker
Browse files

Merge "Revert "Fix missing animation when launch activity from notification.""... 

Merge "Revert "Fix missing animation when launch activity from notification."" into rvc-dev am: a408cd13 am: c0d89ae3

Change-Id: I4f82bcd2b35ed5bb8e0c9d527465718fd0133fd9
parents ee653fbe c0d89ae3

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

+1 −8
Original line number Diff line number Diff line
@@ -321,8 +321,7 @@ public class NotificationShadeWindowController implements Callback, Dumpable, 
                || state.mPanelVisible || state.mKeyguardFadingAway || state.mBouncerShowing

                || state.mHeadsUpShowing

                || state.mScrimsVisibility != ScrimController.TRANSPARENT)

                || state.mBackgroundBlurRadius > 0

                || state.mLaunchingActivity;

                || state.mBackgroundBlurRadius > 0;

    }



    private void applyFitsSystemWindows(State state) {
@@ -486,11 +485,6 @@ public class NotificationShadeWindowController implements Callback, Dumpable, 
        apply(mCurrentState);

    }



    void setLaunchingActivity(boolean launching) {

        mCurrentState.mLaunchingActivity = launching;

        apply(mCurrentState);

    }



    public void setScrimsVisibility(int scrimsVisibility) {

        mCurrentState.mScrimsVisibility = scrimsVisibility;

        apply(mCurrentState);
@@ -651,7 +645,6 @@ public class NotificationShadeWindowController implements Callback, Dumpable, 
        boolean mForceCollapsed;

        boolean mForceDozeBrightness;

        boolean mForceUserActivity;

        boolean mLaunchingActivity;

        boolean mBackdropShowing;

        boolean mWallpaperSupportsAmbientMode;

        boolean mNotTouchable;

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

+1 −7
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ public class NotificationShadeWindowViewController { 
    private PhoneStatusBarView mStatusBarView;

    private PhoneStatusBarTransitions mBarTransitions;

    private StatusBar mService;

    private NotificationShadeWindowController mNotificationShadeWindowController;

    private DragDownHelper mDragDownHelper;

    private boolean mDoubleTapEnabled;

    private boolean mSingleTapEnabled;
@@ -431,14 +430,10 @@ public class NotificationShadeWindowViewController { 


    public void setExpandAnimationPending(boolean pending) {

        mExpandAnimationPending = pending;

        mNotificationShadeWindowController

                .setLaunchingActivity(mExpandAnimationPending | mExpandAnimationRunning);

    }



    public void setExpandAnimationRunning(boolean running) {

        mExpandAnimationRunning = running;

        mNotificationShadeWindowController

                .setLaunchingActivity(mExpandAnimationPending | mExpandAnimationRunning);

    }



    public void cancelExpandHelper() {
@@ -461,9 +456,8 @@ public class NotificationShadeWindowViewController { 
        }

    }



    public void setService(StatusBar statusBar, NotificationShadeWindowController controller) {

    public void setService(StatusBar statusBar) {

        mService = statusBar;

        mNotificationShadeWindowController = controller;

    }



    @VisibleForTesting

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

+1 −1
Original line number Diff line number Diff line
@@ -1001,7 +1001,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        updateTheme();



        inflateStatusBarWindow();

        mNotificationShadeWindowViewController.setService(this, mNotificationShadeWindowController);

        mNotificationShadeWindowViewController.setService(this);

        mNotificationShadeWindowView.setOnTouchListener(getStatusBarWindowTouchListener());



        // TODO: Deal with the ugliness that comes from having some of the statusbar broken out

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

+1 −2
Original line number Diff line number Diff line
@@ -83,7 +83,6 @@ public class NotificationShadeWindowViewTest extends SysuiTestCase { 
    @Mock private NotificationStackScrollLayout mNotificationStackScrollLayout;

    @Mock private NotificationShadeDepthController mNotificationShadeDepthController;

    @Mock private SuperStatusBarViewFactory mStatusBarViewFactory;

    @Mock private NotificationShadeWindowController mNotificationShadeWindowController;



    @Before

    public void setUp() {
@@ -122,7 +121,7 @@ public class NotificationShadeWindowViewTest extends SysuiTestCase { 
                mNotificationPanelViewController,

                mStatusBarViewFactory);

        mController.setupExpandedStatusBar();

        mController.setService(mStatusBar, mNotificationShadeWindowController);

        mController.setService(mStatusBar);

        mController.setDragDownHelper(mDragDownHelper);



    }