From 8c476ed761bea7f469d0ccb430884e08c3c51520 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Fri, 30 Apr 2021 13:30:59 -0400
Subject: [PATCH] Fix pageMargin in PagedTileLayout

Page margin was being set again from inside PagedTileLayout. Only set at
QSContainerImpl level, based on margins.

As the controller calls updateResources on view attached, they will get
set correctly as soon as the view is attached.

Test: manual
Fixes: 186863859
Change-Id: I8a9f22cc35899ba081bd94c48b3647fc7ae89829
---
 .../src/com/android/systemui/qs/PagedTileLayout.java        | 6 ------
 .../src/com/android/systemui/qs/QSContainerImpl.java        | 5 +++--
 2 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
index c552e89a36259..aa4fb712090b4 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
@@ -7,7 +7,6 @@ import android.animation.ObjectAnimator;
 import android.animation.PropertyValuesHolder;
 import android.content.Context;
 import android.content.res.Configuration;
-import android.content.res.Resources;
 import android.os.Bundle;
 import android.util.AttributeSet;
 import android.util.Log;
@@ -333,11 +332,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
 
     @Override
     public boolean updateResources() {
-        // Update bottom padding, useful for removing extra space once the panel page indicator is
-        // hidden.
-        Resources res = getContext().getResources();
-        setPageMargin(res.getDimensionPixelOffset(R.dimen.qs_tile_margin_horizontal));
-
         setPadding(0, 0, 0,
                 getContext().getResources().getDimensionPixelSize(
                         R.dimen.qs_paged_tile_layout_padding_bottom));
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java
index f486c535d9e24..3b436769a4568 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java
@@ -207,11 +207,12 @@ public class QSContainerImpl extends FrameLayout {
                 mContext.getResources().getDimensionPixelSize(R.dimen.qs_container_bottom_padding)
         );
 
-        mSideMargins = getResources().getDimensionPixelSize(R.dimen.notification_side_paddings);
+        int sideMargins = getResources().getDimensionPixelSize(R.dimen.notification_side_paddings);
         int padding = getResources().getDimensionPixelSize(
                 R.dimen.notification_shade_content_margin_horizontal);
-        boolean marginsChanged = padding != mContentPadding;
+        boolean marginsChanged = padding != mContentPadding || sideMargins != mSideMargins;
         mContentPadding = padding;
+        mSideMargins = sideMargins;
         if (marginsChanged) {
             updatePaddingsAndMargins(qsPanelController, quickStatusBarHeaderController);
         }