Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 59925761 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "AOD/LS Clock fixes" into sc-dev am: d5f04a78 am: 00c0eedf am: fdaaab89 

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

Change-Id: I9d3c5d27ef6986475e8e9d9648ce23ac2992a96b
parents 77028c32 fdaaab89

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java

+0 −4
Original line number Diff line number Diff line
@@ -305,10 +305,6 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS 
            // know that it should re-position our SmartSpace.

            if (mKeyguardUnlockAnimationController.isUnlockingWithSmartSpaceTransition()) {

                mKeyguardUnlockAnimationController.updateLockscreenSmartSpacePosition();

            } else {

                // Otherwise, reset Y translation in case it's still offset from a previous shared

                // element transition.

                ((View) mSmartspaceView).setTranslationY(0f);

            }

        }

packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV 
                // element transition.

                if (keyguardStateController.isShowing()) {

                    mView.setChildrenAlphaExcludingClockView(1f);

                    mKeyguardClockSwitchController.setChildrenAlphaExcludingSmartspace(1f);

                }

            }

        });