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

am 3dcd4c89: Merge "Fixed a flash when launching keyguard affordances" into mnc-dev

Browse Source 
* commit '3dcd4c8948a990dfb98b035198c076b07d115720':
  Fixed a flash when launching keyguard affordances
This commit is contained in:
Selim Cinek
2015-05-22 20:23:29 +00:00
committed by Android Git Automerger
parent 369e607472 3dcd4c8948
commit f949c8ef62
2 changed files with 25 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1600,6 +1600,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
if (mBackdrop == null) return; // called too early if (mBackdrop == null) return; // called too early
if (mLaunchTransitionFadingAway) {
mBackdrop.setVisibility(View.INVISIBLE);
return;
}
if (DEBUG_MEDIA) { if (DEBUG_MEDIA) {
Log.v(TAG, "DEBUG_MEDIA: updating album art for notification " + mMediaNotificationKey Log.v(TAG, "DEBUG_MEDIA: updating album art for notification " + mMediaNotificationKey
+ " metadata=" + mMediaMetadata + " metadata=" + mMediaMetadata
@@ -3186,9 +3191,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
public void showKeyguard() { public void showKeyguard() {
if (mLaunchTransitionFadingAway) { if (mLaunchTransitionFadingAway) {
mNotificationPanel.animate().cancel(); mNotificationPanel.animate().cancel();
mNotificationPanel.setAlpha(1f); onLaunchTransitionFadingEnded();
runLaunchTransitionEndRunnable();
mLaunchTransitionFadingAway = false;
} }
mHandler.removeMessages(MSG_LAUNCH_TRANSITION_TIMEOUT); mHandler.removeMessages(MSG_LAUNCH_TRANSITION_TIMEOUT);
setBarState(StatusBarState.KEYGUARD); setBarState(StatusBarState.KEYGUARD);
@@ -3209,6 +3212,14 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
} }
} }
private void onLaunchTransitionFadingEnded() {
mNotificationPanel.setAlpha(1.0f);
runLaunchTransitionEndRunnable();
mLaunchTransitionFadingAway = false;
mScrimController.forceHideScrims(false /* hide */);
updateMediaMetaData(true /* metaDataChanged */);
}
public boolean isCollapsing() { public boolean isCollapsing() {
return mNotificationPanel.isCollapsing(); return mNotificationPanel.isCollapsing();
} }
@@ -3240,6 +3251,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
if (beforeFading != null) { if (beforeFading != null) {
beforeFading.run(); beforeFading.run();
} }
mScrimController.forceHideScrims(true /* hide */);
updateMediaMetaData(false);
mNotificationPanel.setAlpha(1); mNotificationPanel.setAlpha(1);
mNotificationPanel.animate() mNotificationPanel.animate()
.alpha(0) .alpha(0)
@@ -3249,9 +3262,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
.withEndAction(new Runnable() { .withEndAction(new Runnable() {
@Override @Override
public void run() { public void run() {
mNotificationPanel.setAlpha(1); onLaunchTransitionFadingEnded();
runLaunchTransitionEndRunnable();
mLaunchTransitionFadingAway = false;
} }
}); });
mIconController.appTransitionStarting(SystemClock.uptimeMillis(), mIconController.appTransitionStarting(SystemClock.uptimeMillis(),

9
packages/SystemUI/src/com/android/systemui/statusbar/phone/ScrimController.java
View File

@@ -83,6 +83,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
private int mPinnedHeadsUpCount; private int mPinnedHeadsUpCount;
private float mTopHeadsUpDragAmount; private float mTopHeadsUpDragAmount;
private View mDraggedHeadsUpView; private View mDraggedHeadsUpView;
private boolean mForceHideScrims;
public ScrimController(ScrimView scrimBehind, ScrimView scrimInFront, View headsUpScrim, public ScrimController(ScrimView scrimBehind, ScrimView scrimInFront, View headsUpScrim,
boolean scrimSrcEnabled) { boolean scrimSrcEnabled) {
@@ -176,7 +177,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
} }
private void updateScrims() { private void updateScrims() {
if (mAnimateKeyguardFadingOut) { if (mAnimateKeyguardFadingOut || mForceHideScrims) {
setScrimInFrontColor(0f); setScrimInFrontColor(0f);
setScrimBehindColor(0f); setScrimBehindColor(0f);
} else if (!mKeyguardShowing && !mBouncerShowing) { } else if (!mKeyguardShowing && !mBouncerShowing) {
@@ -440,4 +441,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
expandFactor = Math.max(expandFactor, 0.0f); expandFactor = Math.max(expandFactor, 0.0f);
return alpha * expandFactor; return alpha * expandFactor;
} }
public void forceHideScrims(boolean hide) {
mForceHideScrims = hide;
mAnimateChange = false;
scheduleUpdate();
}
} }