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

Merge changes I4d34ed4b,Iddfbdf5c into nyc-dev

Browse Source 
* changes:
  Fixed a bug where the pin wasn't scaled correctly
  Fixed a bug where the scrim was transparent
This commit is contained in:
TreeHugger Robot
2016-05-04 23:31:31 +00:00
committed by Android (Google) Code Review
parent 05d61edeb2 aa8bbf1aef
commit 17bc1fd090
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -974,6 +974,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
inflateEmptyShadeView(); inflateEmptyShadeView();
updateEmptyShadeView(); updateEmptyShadeView();
inflateOverflowContainer(); inflateOverflowContainer();
mStatusBarKeyguardViewManager.onDensityOrFontScaleChanged();
} }
private void inflateSignalClusters() { private void inflateSignalClusters() {

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

@@ -91,6 +91,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
private boolean mSkipFirstFrame; private boolean mSkipFirstFrame;
private boolean mDontAnimateBouncerChanges; private boolean mDontAnimateBouncerChanges;
private boolean mKeyguardFadingOutInProgress; private boolean mKeyguardFadingOutInProgress;
private ValueAnimator mKeyguardFadeoutAnimation;
public ScrimController(ScrimView scrimBehind, ScrimView scrimInFront, View headsUpScrim) { public ScrimController(ScrimView scrimBehind, ScrimView scrimInFront, View headsUpScrim) {
mScrimBehind = scrimBehind; mScrimBehind = scrimBehind;
@@ -135,6 +136,9 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
if (mPinnedHeadsUpCount != 0) { if (mPinnedHeadsUpCount != 0) {
updateHeadsUpScrim(false); updateHeadsUpScrim(false);
} }
if (mKeyguardFadeoutAnimation != null) {
mKeyguardFadeoutAnimation.cancel();
}
} }
} }
@@ -345,7 +349,10 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
mOnAnimationFinished.run(); mOnAnimationFinished.run();
mOnAnimationFinished = null; mOnAnimationFinished = null;
} }
if (mKeyguardFadingOutInProgress) {
mKeyguardFadeoutAnimation = null;
mKeyguardFadingOutInProgress = false; mKeyguardFadingOutInProgress = false;
}
scrim.setTag(TAG_KEY_ANIM, null); scrim.setTag(TAG_KEY_ANIM, null);
scrim.setTag(TAG_KEY_ANIM_TARGET, null); scrim.setTag(TAG_KEY_ANIM_TARGET, null);
} }
@@ -353,6 +360,7 @@ public class ScrimController implements ViewTreeObserver.OnPreDrawListener,
anim.start(); anim.start();
if (mAnimateKeyguardFadingOut) { if (mAnimateKeyguardFadingOut) {
mKeyguardFadingOutInProgress = true; mKeyguardFadingOutInProgress = true;
mKeyguardFadeoutAnimation = anim;
} }
if (mSkipFirstFrame) { if (mSkipFirstFrame) {
anim.setCurrentPlayTime(16); anim.setCurrentPlayTime(16);

4
packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBarKeyguardViewManager.java
View File

@@ -349,6 +349,10 @@ public class StatusBarKeyguardViewManager implements RemoteInputController.Callb
} }
} }
public void onDensityOrFontScaleChanged() {
mBouncer.hide(true /* destroyView */);
}
private void animateScrimControllerKeyguardFadingOut(long delay, long duration, private void animateScrimControllerKeyguardFadingOut(long delay, long duration,
boolean skipFirstFrame) { boolean skipFirstFrame) {
animateScrimControllerKeyguardFadingOut(delay, duration, null /* endRunnable */, animateScrimControllerKeyguardFadingOut(delay, duration, null /* endRunnable */,