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

Merge "Media - Don't animate during camera gesture" into rvc-qpr-dev am: 58e3d8b33e

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12410244

Change-Id: Ia2e4cfce50eb8f0d605da12d63c25104e7be1f16
This commit is contained in:
TreeHugger Robot
2020-08-20 14:30:31 +00:00
committed by Automerger Merge Worker
parent 1a3ff01217 58e3d8b33e
commit 68279a3586
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/media/MediaHierarchyManager.kt
View File

@@ -389,6 +389,14 @@ class MediaHierarchyManager @Inject constructor(
if (isCurrentlyInGuidedTransformation()) { if (isCurrentlyInGuidedTransformation()) {
return false return false
} }
// This is an invalid transition, and can happen when using the camera gesture from the
// lock screen. Disallow.
if (previousLocation == LOCATION_LOCKSCREEN &&
desiredLocation == LOCATION_QQS &&
statusbarState == StatusBarState.SHADE) {
return false
}
if (currentLocation == LOCATION_QQS && if (currentLocation == LOCATION_QQS &&
previousLocation == LOCATION_LOCKSCREEN && previousLocation == LOCATION_LOCKSCREEN &&
(statusBarStateController.leaveOpenOnKeyguardHide() || (statusBarStateController.leaveOpenOnKeyguardHide() ||
@@ -604,8 +612,8 @@ class MediaHierarchyManager @Inject constructor(
// When collapsing on the lockscreen, we want to remain in QS // When collapsing on the lockscreen, we want to remain in QS
return LOCATION_QS return LOCATION_QS
} }
if (location != LOCATION_LOCKSCREEN && desiredLocation == LOCATION_LOCKSCREEN if (location != LOCATION_LOCKSCREEN && desiredLocation == LOCATION_LOCKSCREEN &&
&& !fullyAwake) { !fullyAwake) {
// When unlocking from dozing / while waking up, the media shouldn't be transitioning // When unlocking from dozing / while waking up, the media shouldn't be transitioning
// in an animated way. Let's keep it in the lockscreen until we're fully awake and // in an animated way. Let's keep it in the lockscreen until we're fully awake and
// reattach it without an animation // reattach it without an animation