Merge "AOD/LS Clock fixes" into sc-dev

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

@@ -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

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