From 7994f8159af4bab5cd271cd2938afd7a81b64865 Mon Sep 17 00:00:00 2001
From: Matt Pietal <mpietal@google.com>
Date: Tue, 13 Apr 2021 11:20:48 -0400
Subject: [PATCH] Smartspace - Align large clock

The large clock was not properly set below the new smartspace when the
plugin was activiated. Fix that.

Fixes: 185226009
Test: atest KeyguardClockSwitchControllerTest
Change-Id: Ib9c1f837128524b8a896ed12eee7b70cc145ec28
---
 .../android/keyguard/KeyguardClockSwitchController.java    | 7 +++++++
 .../keyguard/KeyguardClockSwitchControllerTest.java        | 4 ++++
 2 files changed, 11 insertions(+)

diff --git a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
index 032ed7da0a46b..cb825c0436422 100644
--- a/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
+++ b/packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitchController.java
@@ -188,6 +188,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
                 mSmartspaceView.registerDataProvider(plugin);
                 View asView = (View) mSmartspaceView;
 
+                // Place plugin view below normal clock...
                 RelativeLayout.LayoutParams lp = new RelativeLayout.LayoutParams(
                         MATCH_PARENT, WRAP_CONTENT);
                 lp.addRule(RelativeLayout.BELOW, R.id.lockscreen_clock_view);
@@ -197,6 +198,11 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
                         .getDimensionPixelSize(R.dimen.below_clock_padding_start);
                 asView.setPadding(padding, 0, padding, 0);
 
+                // ... but above the large clock
+                lp = new RelativeLayout.LayoutParams(MATCH_PARENT, WRAP_CONTENT);
+                lp.addRule(RelativeLayout.BELOW, asView.getId());
+                mLargeClockFrame.setLayoutParams(lp);
+
                 View nic = mView.findViewById(
                         com.android.systemui.R.id.left_aligned_notification_icon_container);
                 lp = (RelativeLayout.LayoutParams) nic.getLayoutParams();
@@ -219,6 +225,7 @@ public class KeyguardClockSwitchController extends ViewController<KeyguardClockS
                         nic.getLayoutParams();
                 lp.addRule(RelativeLayout.BELOW, R.id.keyguard_status_area);
                 nic.setLayoutParams(lp);
+                mLargeClockFrame.setLayoutParams(lp);
 
                 mSmartspaceView = null;
             }
diff --git a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java
index 9017dd244fb4a..e2e28b8cb7862 100644
--- a/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java
+++ b/packages/SystemUI/tests/src/com/android/keyguard/KeyguardClockSwitchControllerTest.java
@@ -31,6 +31,7 @@ import android.test.suitebuilder.annotation.SmallTest;
 import android.testing.AndroidTestingRunner;
 import android.util.AttributeSet;
 import android.view.View;
+import android.widget.FrameLayout;
 import android.widget.RelativeLayout;
 
 import com.android.internal.colorextraction.ColorExtractor;
@@ -98,6 +99,8 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase {
     @Mock
     private AnimatableClockView mLargeClockView;
     @Mock
+    private FrameLayout mLargeClockFrame;
+    @Mock
     BatteryController mBatteryController;
 
     private KeyguardClockSwitchController mController;
@@ -112,6 +115,7 @@ public class KeyguardClockSwitchControllerTest extends SysuiTestCase {
 
         when(mView.findViewById(R.id.animatable_clock_view)).thenReturn(mClockView);
         when(mView.findViewById(R.id.animatable_clock_view_large)).thenReturn(mLargeClockView);
+        when(mView.findViewById(R.id.lockscreen_clock_view_large)).thenReturn(mLargeClockFrame);
         when(mClockView.getContext()).thenReturn(getContext());
         when(mLargeClockView.getContext()).thenReturn(getContext());