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

Merge "AOD animation polish" into pi-dev

Browse Source 
am: 704a0d6174

Change-Id: Ia5662e819573ba45707f4f2dd4f166c64d87154e
This commit is contained in:
Lucas Dupin
2018-06-29 11:40:43 -07:00
committed by android-build-merger
parent 93c577b224 704a0d6174
commit e9861964bf
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/src/com/android/keyguard/KeyguardStatusView.java
View File

@@ -199,6 +199,9 @@ public class KeyguardStatusView extends GridLayout implements
mClockView.setElegantTextHeight(false);
}
/**
* Moves clock and separator, adjusting margins when slice content changes.
*/
private void onSliceContentChanged() {
boolean smallClock = mKeyguardSlice.hasHeader() || mPulsing;
float clockScale = smallClock ? mSmallClockScale : 1;
@@ -221,7 +224,7 @@ public class KeyguardStatusView extends GridLayout implements
@Override
public void onLayoutChange(View view, int left, int top, int right, int bottom,
int oldLeft, int oldTop, int oldRight, int oldBottom) {
int heightOffset = mPulsing ? 0 : getHeight() - mLastLayoutHeight;
int heightOffset = mPulsing || mWasPulsing ? 0 : getHeight() - mLastLayoutHeight;
boolean hasHeader = mKeyguardSlice.hasHeader();
boolean smallClock = hasHeader || mPulsing;
long duration = KeyguardSliceView.DEFAULT_ANIM_DURATION;
@@ -457,6 +460,11 @@ public class KeyguardStatusView extends GridLayout implements
mWasPulsing = true;
}
mPulsing = pulsing;
// Animation can look really weird when the slice has a header, let's hide the views
// immediately instead of fading them away.
if (mKeyguardSlice.hasHeader()) {
animate = false;
}
mKeyguardSlice.setPulsing(pulsing, animate);
updateDozeVisibleViews();
}