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

Commit a174e882 authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by wilsonshih
Browse files

Revert^2 Fix missing animation when launch activity from notification 

The remote animaton is controlled by notification shade, if we set
the notification shade set to invisible, although the animator is
still running, but surface won't update.
Extending the visibility time until the animation finish can
solve this problem.

Also post the calling of setLaunchResult from main thread so
mIsLaunchForActivity and mAnimationPending can be synchronized.

Fixes: 154815513
Test: atest SystemUITests
Test: Follow the issue description.
Change-Id: I735340498575e2d7dc5a95ec1be3aa886739ecc4
parent 016ea8a0

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

+13 −3
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;
@@ -429,11 +430,19 @@ public class NotificationShadeWindowViewController { 
    }



    public void setExpandAnimationPending(boolean pending) {

        if (mExpandAnimationPending != pending) {

            mExpandAnimationPending = pending;

            mNotificationShadeWindowController

                    .setLaunchingActivity(mExpandAnimationPending | mExpandAnimationRunning);

        }

    }



    public void setExpandAnimationRunning(boolean running) {

        if (mExpandAnimationRunning != running) {

            mExpandAnimationRunning = running;

            mNotificationShadeWindowController

                    .setLaunchingActivity(mExpandAnimationPending | mExpandAnimationRunning);

        }

    }



    public void cancelExpandHelper() {
@@ -456,8 +465,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/src/com/android/systemui/statusbar/phone/StatusBarNotificationActivityStarter.java

+5 −2
Original line number Diff line number Diff line
@@ -429,7 +429,9 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit 
            }

            int launchResult = intent.sendAndReturnResult(mContext, 0, fillInIntent, null,

                    null, null, getActivityOptions(adapter));

            mMainThreadHandler.post(() -> {

                mActivityLaunchAnimator.setLaunchResult(launchResult, isActivityIntent);

            });

        } catch (RemoteException | PendingIntent.CanceledException e) {

            // the stack trace isn't very helpful here.

            // Just log the exception message.
@@ -449,10 +451,11 @@ public class StatusBarNotificationActivityStarter implements NotificationActivit 
                                mActivityLaunchAnimator.getLaunchAnimation(

                                        row, mStatusBar.isOccluded())),

                                new UserHandle(UserHandle.getUserId(appUid)));

                mActivityLaunchAnimator.setLaunchResult(launchResult, true /* isActivityIntent */);



                // Putting it back on the main thread, since we're touching views

                mMainThreadHandler.post(() -> {

                    mActivityLaunchAnimator.setLaunchResult(launchResult,

                            true /* isActivityIntent */);

                    removeHUN(row);

                });

                if (shouldCollapse()) {

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



    }