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

Merge changes I447f5c9c,Id3de50c6,I13e9ef2f into sc-v2-dev

Browse Source 
* changes:
  Don't show the keyguard status bar if we're animating the screen off.
  Adjust unlock parameters so that the lockscreen content doesn't overlap with the app/launcher.
  Don't play the screen off animation if we disabled animations system-wide.
This commit is contained in:
TreeHugger Robot
2021-10-19 22:40:28 +00:00
committed by Android (Google) Code Review
parent 0363d75290 6ab3eb7c81
commit 3f7564a1ae
3 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/systemui/keyguard/KeyguardUnlockAnimationController.kt
View File

@@ -62,7 +62,7 @@ const val SURFACE_BEHIND_SCALE_PIVOT_Y = 0.66f
* The dismiss amount is the inverse of the notification panel expansion, which decreases as the * The dismiss amount is the inverse of the notification panel expansion, which decreases as the
* lock screen is swiped away. * lock screen is swiped away.
*/ */
const val DISMISS_AMOUNT_SHOW_SURFACE_THRESHOLD = 0.1f const val DISMISS_AMOUNT_SHOW_SURFACE_THRESHOLD = 0.25f
/** /**
* Dismiss amount at which to complete the keyguard exit animation and hide the keyguard. * Dismiss amount at which to complete the keyguard exit animation and hide the keyguard.
@@ -70,7 +70,7 @@ const val DISMISS_AMOUNT_SHOW_SURFACE_THRESHOLD = 0.1f
* The dismiss amount is the inverse of the notification panel expansion, which decreases as the * The dismiss amount is the inverse of the notification panel expansion, which decreases as the
* lock screen is swiped away. * lock screen is swiped away.
*/ */
const val DISMISS_AMOUNT_EXIT_KEYGUARD_THRESHOLD = 0.3f const val DISMISS_AMOUNT_EXIT_KEYGUARD_THRESHOLD = 0.4f
/** /**
* Initiates, controls, and ends the keyguard unlock animation. * Initiates, controls, and ends the keyguard unlock animation.

13
packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelViewController.java
View File

@@ -4380,9 +4380,16 @@ public class NotificationPanelViewController extends PanelViewController {
} }
} }
} else { } else {
mKeyguardStatusBarViewController.updateViewState( final boolean animatingUnlockedShadeToKeyguard = oldState == SHADE
/* alpha= */ 1f, && statusBarState == KEYGUARD
keyguardShowing ? View.VISIBLE : View.INVISIBLE); && mUnlockedScreenOffAnimationController.isScreenOffAnimationPlaying();
if (!animatingUnlockedShadeToKeyguard) {
// Only make the status bar visible if we're not animating the screen off, since
// we only want to be showing the clock/notifications during the animation.
mKeyguardStatusBarViewController.updateViewState(
/* alpha= */ 1f,
keyguardShowing ? View.VISIBLE : View.INVISIBLE);
}
if (keyguardShowing && oldState != mBarState) { if (keyguardShowing && oldState != mBarState) {
if (mQs != null) { if (mQs != null) {
mQs.hideImmediately(); mQs.hideImmediately();

6
packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt
View File

@@ -226,6 +226,12 @@ class UnlockedScreenOffAnimationController @Inject constructor(
return false return false
} }
// If animations are disabled system-wide, don't play this one either.
if (Settings.Global.getString(
context.contentResolver, Settings.Global.ANIMATOR_DURATION_SCALE) == "0") {
return false
}
// We only play the unlocked screen off animation if we are... unlocked. // We only play the unlocked screen off animation if we are... unlocked.
if (statusBarStateControllerImpl.state != StatusBarState.SHADE) { if (statusBarStateControllerImpl.state != StatusBarState.SHADE) {
return false return false