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

Commit 9ba45e02 authored by Lucas Dupin's avatar Lucas Dupin Committed by android-build-merger
Browse files

Merge "Fix issue where panel wouldn't collapse" into pi-dev am: a0b6b503 

am: 138b13d2

Change-Id: If1b45d1b69892ca7dbfbe66a63ba83c8cd275cd3
parents 51d8018b 138b13d2

packages/SystemUI/src/com/android/systemui/statusbar/notification/ActivityLaunchAnimator.java

+2 −2
Original line number Diff line number Diff line
@@ -76,8 +76,8 @@ public class ActivityLaunchAnimator { 
    }



    public RemoteAnimationAdapter getLaunchAnimation(

            ExpandableNotificationRow sourceNotification) {

        if (mStatusBar.getBarState() != StatusBarState.SHADE) {

            ExpandableNotificationRow sourceNotification, boolean occluded) {

        if (mStatusBar.getBarState() != StatusBarState.SHADE || occluded) {

            return null;

        }

        AnimationRunner animationRunner = new AnimationRunner(sourceNotification);

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

+4 −2
Original line number Diff line number Diff line
@@ -5058,6 +5058,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
        final boolean afterKeyguardGone = intent.isActivity()

                && PreviewInflater.wouldLaunchResolverActivity(mContext, intent.getIntent(),

                mLockscreenUserManager.getCurrentUserId());

        final boolean wasOccluded = mIsOccluded;

        dismissKeyguardThenExecute(() -> {

            // TODO: Some of this code may be able to move to NotificationEntryManager.

            if (mHeadsUpManager != null && mHeadsUpManager.isHeadsUp(notificationKey)) {
@@ -5121,7 +5122,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                                remoteInputText.toString());

                    }

                    RemoteAnimationAdapter adapter = mActivityLaunchAnimator.getLaunchAnimation(

                            row);

                            row, wasOccluded);

                    try {

                        if (adapter != null) {

                            ActivityManager.getService()
@@ -5168,6 +5169,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
            if (mStatusBarKeyguardViewManager.isShowing()

                    && mStatusBarKeyguardViewManager.isOccluded()) {

                mStatusBarKeyguardViewManager.addAfterKeyguardGoneRunnable(runnable);

                collapsePanel(true /* animate */);

            } else {

                new Thread(runnable).start();

            }
@@ -5252,7 +5254,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
                int launchResult = TaskStackBuilder.create(mContext)

                        .addNextIntentWithParentStack(intent)

                        .startActivities(getActivityOptions(

                                mActivityLaunchAnimator.getLaunchAnimation(row)),

                                mActivityLaunchAnimator.getLaunchAnimation(row, mIsOccluded)),

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

                mActivityLaunchAnimator.setLaunchResult(launchResult);

                if (shouldCollapse()) {