Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 4eedc1d9: Fix jank when launching something from lockscreen

Browse Source 
* commit '4eedc1d97e5aa3bfaa60af9894cd991f9e210fc2':
  Fix jank when launching something from lockscreen
This commit is contained in:
Jorim Jaggi
2014-10-28 16:44:36 +00:00
committed by Android Git Automerger
parent 4a915ab505 4eedc1d97e
commit 76dfffeb9f
3 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java
View File

@@ -297,7 +297,8 @@ public abstract class BaseStatusBar extends SystemUI implements
// close the shade if it was open // close the shade if it was open
if (handled) { if (handled) {
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */); animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
true /* force */);
visibilityChanged(false); visibilityChanged(false);
} }
// Wait for activity start. // Wait for activity start.
@@ -374,7 +375,8 @@ public abstract class BaseStatusBar extends SystemUI implements
Settings.Secure.putInt(mContext.getContentResolver(), Settings.Secure.putInt(mContext.getContentResolver(),
Settings.Secure.SHOW_NOTE_ABOUT_NOTIFICATION_HIDING, 0); Settings.Secure.SHOW_NOTE_ABOUT_NOTIFICATION_HIDING, 0);
if (BANNER_ACTION_SETUP.equals(action)) { 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) mContext.startActivity(new Intent(Settings.ACTION_APP_NOTIFICATION_REDACTION)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .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; return true;
} }
}, false /* afterKeyguardGone */); }, false /* afterKeyguardGone */);
@@ -1564,7 +1566,8 @@ public abstract class BaseStatusBar extends SystemUI implements
}.start(); }.start();
// close the shade if it was open // close the shade if it was open
animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_NONE, true /* force */); animateCollapsePanels(CommandQueue.FLAG_EXCLUDE_RECENTS_PANEL,
true /* force */);
visibilityChanged(false); visibilityChanged(false);
return mIntent != null && mIntent.isActivity(); return mIntent != null && mIntent.isActivity();

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

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

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

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