am dc9f9420: am 4eedc1d9: Fix jank when launching something from lockscreen automerge: 76dfffe (c8987132) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+7 −4

Original line number	Diff line number	Diff line
		@@ -297,7 +297,8 @@ public abstract class BaseStatusBar extends SystemUI implements

		// close the shade if it was open
		if (handled) {
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
		true /* force */);
		visibilityChanged(false);
		}
		// Wait for activity start.
		@@ -374,7 +375,8 @@ public abstract class BaseStatusBar extends SystemUI implements
		Settings.Secure.putInt(mContext.getContentResolver(),
		Settings.Secure.SHOW_NOTE_ABOUT_NOTIFICATION_HIDING, 0);
		if (BANNER_ACTION_SETUP.equals(action)) {
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
		true /* force */);
		mContext.startActivity(new Intent(Settings.ACTION_APP_NOTIFICATION_REDACTION)
		.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)

		@@ -799,7 +801,7 @@ public abstract class BaseStatusBar extends SystemUI implements
		}
		}
		});
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true /* force */);
		return true;
		}
		}, false /* afterKeyguardGone */);
		@@ -1564,7 +1566,8 @@ public abstract class BaseStatusBar extends SystemUI implements
		}.start();

		// close the shade if it was open
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
		true /* force */);
		visibilityChanged(false);

		return mIntent != null && mIntent.isActivity();

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -133,7 +133,7 @@ public class KeyguardBottomAreaView extends FrameLayout implements View.OnClickL
		if (action == ACTION_CLICK) {
		if (host == mLockIcon) {
		mPhoneStatusBar.animateCollapsePanels(
		CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
		CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true /* force */);
		return true;
		} else if (host == mCameraImageView) {
		launchCamera();

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

+4 −2

Original line number	Diff line number	Diff line
		@@ -3052,7 +3052,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		}
		});
		if (dismissShade) {
		animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */);
		animateCollapsePanels(
		CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL, true /* force */);
		}
		return true;
		}
		@@ -3741,7 +3742,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
		public boolean onSpacePressed() {
		if (mScreenOn != null && mScreenOn
		&& (mState == StatusBarState.KEYGUARD \|\| mState == StatusBarState.SHADE_LOCKED)) {
		animateCollapsePanels(0 /* flags /, true / force */);
		animateCollapsePanels(
		CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL /* flags /, true / force */);
		return true;
		}
		return false;