From ab8a78f9a5c4b84e071863c929e1464cbfedc270 Mon Sep 17 00:00:00 2001
From: Michal Brzezinski <brzezinski@google.com>
Date: Tue, 8 Mar 2022 17:50:11 +0000
Subject: [PATCH] Adjusting margins and paddings for portrait shade on large
 screens

1. Notifications were too narrow as side margins didn't account for NSSL padding
2. Increasing padding for sw720dp-port so that notification scrim takes more space

Fixes: 222472648
Test: compare lockscreen and shade to specs
Change-Id: I92cf020bc4763a47b5e0f99bfd68b8eb1f5675d2
---
 packages/SystemUI/res/values-sw600dp-port/dimens.xml         | 2 +-
 packages/SystemUI/res/values-sw720dp-port/dimens.xml         | 5 ++++-
 packages/SystemUI/res/values/dimens.xml                      | 2 +-
 .../stack/NotificationStackScrollLayoutController.java       | 4 ----
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/packages/SystemUI/res/values-sw600dp-port/dimens.xml b/packages/SystemUI/res/values-sw600dp-port/dimens.xml
index c9906053b4cbf..f5c0509dbf5b2 100644
--- a/packages/SystemUI/res/values-sw600dp-port/dimens.xml
+++ b/packages/SystemUI/res/values-sw600dp-port/dimens.xml
@@ -15,7 +15,7 @@
   ~ limitations under the License.
   -->
 <resources>
-    <dimen name="notification_panel_margin_horizontal">60dp</dimen>
+    <dimen name="notification_panel_margin_horizontal">48dp</dimen>
     <dimen name="status_view_margin_horizontal">62dp</dimen>
     <dimen name="keyguard_clock_top_margin">40dp</dimen>
     <dimen name="keyguard_status_view_bottom_margin">40dp</dimen>
diff --git a/packages/SystemUI/res/values-sw720dp-port/dimens.xml b/packages/SystemUI/res/values-sw720dp-port/dimens.xml
index e5f502f952908..44f8f3aee9ab2 100644
--- a/packages/SystemUI/res/values-sw720dp-port/dimens.xml
+++ b/packages/SystemUI/res/values-sw720dp-port/dimens.xml
@@ -21,8 +21,11 @@
      for different hardware and product builds. -->
 <resources>
     <dimen name="status_view_margin_horizontal">124dp</dimen>
-    <dimen name="notification_panel_margin_horizontal">120dp</dimen>
     <dimen name="keyguard_clock_top_margin">80dp</dimen>
     <dimen name="keyguard_status_view_bottom_margin">80dp</dimen>
     <dimen name="bouncer_user_switcher_y_trans">90dp</dimen>
+
+    <dimen name="notification_panel_margin_horizontal">96dp</dimen>
+    <dimen name="notification_side_paddings">40dp</dimen>
+    <dimen name="notification_section_divider_height">16dp</dimen>
 </resources>
diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml
index 5ca7285d3f737..bb7cadf71ebfc 100644
--- a/packages/SystemUI/res/values/dimens.xml
+++ b/packages/SystemUI/res/values/dimens.xml
@@ -139,7 +139,7 @@
     <!-- Height of a heads up notification in the status bar -->
     <dimen name="notification_max_heads_up_height_increased">188dp</dimen>
 
-    <!-- Side padding on the lockscreen on the side of notifications -->
+    <!-- Side padding on the side of notifications -->
     <dimen name="notification_side_paddings">16dp</dimen>
 
     <!-- padding between the heads up and the statusbar -->
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
index 7df8e7df486e0..6bbecc8438bc3 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/stack/NotificationStackScrollLayoutController.java
@@ -1233,10 +1233,6 @@ public class NotificationStackScrollLayoutController {
         mView.forceNoOverlappingRendering(force);
     }
 
-    public void setTranslationX(float translation) {
-        mView.setTranslationX(translation);
-    }
-
     public void setExpandingVelocity(float velocity) {
         mView.setExpandingVelocity(velocity);
     }