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

Merge "Fix default occlude animation to scale from 50%, not 0%." into tm-qpr-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2022-11-18 12:06:17 +00:00
committed by Android (Google) Code Review
parent a3256d337d 73f8c3ea4c
commit 7592051299
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java
View File

@@ -895,25 +895,32 @@ public class KeyguardViewMediator implements CoreStartable, Dumpable,
@NonNull @NonNull
@Override @Override
public LaunchAnimator.State createAnimatorState() { public LaunchAnimator.State createAnimatorState() {
final int width = getLaunchContainer().getWidth(); final int fullWidth = getLaunchContainer().getWidth();
final int height = getLaunchContainer().getHeight(); final int fullHeight = getLaunchContainer().getHeight();
final float initialHeight = height / 3f;
final float initialWidth = width / 3f;
if (mUpdateMonitor.isSecureCameraLaunchedOverKeyguard()) { if (mUpdateMonitor.isSecureCameraLaunchedOverKeyguard()) {
final float initialHeight = fullHeight / 3f;
final float initialWidth = fullWidth / 3f;
// Start the animation near the power button, at one-third size, since the // Start the animation near the power button, at one-third size, since the
// camera was launched from the power button. // camera was launched from the power button.
return new LaunchAnimator.State( return new LaunchAnimator.State(
(int) (mPowerButtonY - initialHeight / 2f) /* top */, (int) (mPowerButtonY - initialHeight / 2f) /* top */,
(int) (mPowerButtonY + initialHeight / 2f) /* bottom */, (int) (mPowerButtonY + initialHeight / 2f) /* bottom */,
(int) (width - initialWidth) /* left */, (int) (fullWidth - initialWidth) /* left */,
width /* right */, fullWidth /* right */,
mWindowCornerRadius, mWindowCornerRadius); mWindowCornerRadius, mWindowCornerRadius);
} else { } else {
// Start the animation in the center of the screen, scaled down. final float initialHeight = fullHeight / 2f;
final float initialWidth = fullWidth / 2f;
// Start the animation in the center of the screen, scaled down to half
// size.
return new LaunchAnimator.State( return new LaunchAnimator.State(
height / 2, height / 2, width / 2, width / 2, (int) (fullHeight - initialHeight) / 2,
(int) (initialHeight + (fullHeight - initialHeight) / 2),
(int) (fullWidth - initialWidth) / 2,
(int) (initialWidth + (fullWidth - initialWidth) / 2),
mWindowCornerRadius, mWindowCornerRadius); mWindowCornerRadius, mWindowCornerRadius);
} }
} }