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

Merge "AOD/LS Clock fixes" into sc-dev am: d5f04a7860

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

Change-Id: I52d6a38bccbf1fbff705a4a9efd2ed7becc00174
This commit is contained in:
TreeHugger Robot
2021-06-01 19:42:10 +00:00
committed by Automerger Merge Worker
parent ec5fef625b d5f04a7860
commit 00c0eedf27
2 changed files with 0 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
View File

@@ -305,10 +305,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
// know that it should re-position our SmartSpace. // know that it should re-position our SmartSpace.
if (mKeyguardUnlockAnimationController.isUnlockingWithSmartSpaceTransition()) { if (mKeyguardUnlockAnimationController.isUnlockingWithSmartSpaceTransition()) {
mKeyguardUnlockAnimationController.updateLockscreenSmartSpacePosition(); mKeyguardUnlockAnimationController.updateLockscreenSmartSpacePosition();
} else {
// Otherwise, reset Y translation in case it's still offset from a previous shared
// element transition.
((View) mSmartspaceView).setTranslationY(0f);
} }
} }

1
packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
View File

@@ -89,7 +89,6 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
// element transition. // element transition.
if (keyguardStateController.isShowing()) { if (keyguardStateController.isShowing()) {
mView.setChildrenAlphaExcludingClockView(1f); mView.setChildrenAlphaExcludingClockView(1f);
mKeyguardClockSwitchController.setChildrenAlphaExcludingSmartspace(1f);
} }
} }
}); });