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

Commit 8fafac3b authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Fix missing animation when launch activity from notification." into rvc-dev am: 286d8c00 

Change-Id: I7048ef09ba595b7f2b0b1c4c5194787f7a1a0098
parents 86707820 286d8c00

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

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

                || state.mHeadsUpShowing

                || state.mScrimsVisibility != ScrimController.TRANSPARENT)

                || state.mBackgroundBlurRadius > 0;

                || state.mBackgroundBlurRadius > 0

                || state.mLaunchingActivity;

    }



    private void applyFitsSystemWindows(State state) {
@@ -485,6 +486,11 @@ 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);
@@ -645,6 +651,7 @@ 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

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

    private PhoneStatusBarTransitions mBarTransitions;

    private StatusBar mService;

    private NotificationShadeWindowController mNotificationShadeWindowController;

    private DragDownHelper mDragDownHelper;

    private boolean mDoubleTapEnabled;

    private boolean mSingleTapEnabled;
@@ -430,10 +431,14 @@ 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() {
@@ -456,8 +461,9 @@ public class NotificationShadeWindowViewController { 
        }

    }



    public void setService(StatusBar statusBar) {

    public void setService(StatusBar statusBar, NotificationShadeWindowController controller) {

        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);

        mNotificationShadeWindowViewController.setService(this, mNotificationShadeWindowController);

        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

+2 −1
Original line number Diff line number Diff line
@@ -83,6 +83,7 @@ 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() {
@@ -121,7 +122,7 @@ public class NotificationShadeWindowViewTest extends SysuiTestCase { 
                mNotificationPanelViewController,

                mStatusBarViewFactory);

        mController.setupExpandedStatusBar();

        mController.setService(mStatusBar);

        mController.setService(mStatusBar, mNotificationShadeWindowController);

        mController.setDragDownHelper(mDragDownHelper);



    }