From a2c5ff9b42b13987c97e865736f0a3732f7525a4 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Tue, 1 Jun 2021 10:48:52 -0400
Subject: [PATCH] AOD/LS Clock fixes

Smartspace shared element transitions are interferring with normal
clock operation. Remove the offending lines until a proper fix can be
put in

Fixes: 189534613
Test: manual
Change-Id: Ib4678c1405dff722e57048885d8c3c5fb878c954
---
 .../com/android/keyguard/KeyguardClockSwitchController.java   | 4 ----
 .../com/android/keyguard/KeyguardStatusViewController.java    | 1 -
 2 files changed, 5 deletions(-)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
index 3e084b7d692a8..fbea1e9a594dc 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+++ b/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);
             }
         }
 
diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
index 7b6514a63195a..181db6a945696 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardStatusViewController.java
@@ -87,7 +87,6 @@ public class KeyguardStatusViewController extends ViewController<KeyguardStatusV
                 // element transition.
                 if (keyguardStateController.isShowing()) {
                     mView.setChildrenAlphaExcludingClockView(1f);
-                    mKeyguardClockSwitchController.setChildrenAlphaExcludingSmartspace(1f);
                 }
             }
         });