From b77b8a4bc90c131d817d5834859ee74cf57227dc Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Thu, 12 Nov 2020 13:13:24 -0500
Subject: [PATCH] Minor QS visual fixes

- Have both brightness sliders use same height. That way QS edit mode is
aligned with QS
- Fix PagedTileLayout clipping to clip at the margins. That way, the
visible part of the page correctly aligns with media player.

Test: visual
Change-Id: If99393daefa97011e740b46ea64757f72e425630
---
 .../SystemUI/res/layout/quick_settings_brightness_dialog.xml | 2 +-
 .../src/com/android/systemui/qs/PagedTileLayout.java         | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml
index 11814a1caffae..9cc09aa42f408 100644
--- a/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml
+++ b/packages/SystemUI/res/layout/quick_settings_brightness_dialog.xml
@@ -23,7 +23,7 @@
     <com.android.systemui.settings.brightness.BrightnessSliderView
         android:id="@+id/brightness_slider"
         android:layout_width="0dp"
-        android:layout_height="48dp"
+        android:layout_height="@dimen/brightness_mirror_height"
         android:layout_gravity="center_vertical"
         android:layout_weight="1"
         android:contentDescription="@string/accessibility_brightness"
diff --git a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
index 3062a77bcbe1b..8c7d4596cc0a0 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/PagedTileLayout.java
@@ -63,7 +63,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
     private int mPageToRestore = -1;
     private int mLayoutOrientation;
     private int mLayoutDirection;
-    private int mHorizontalClipBound;
     private final Rect mClippingRect;
     private final UiEventLogger mUiEventLogger = QSEvents.INSTANCE.getQsUiEventsLogger();
     private int mExcessHeight;
@@ -333,7 +332,6 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
         // Update bottom padding, useful for removing extra space once the panel page indicator is
         // hidden.
         Resources res = getContext().getResources();
-        mHorizontalClipBound = res.getDimensionPixelSize(R.dimen.notification_side_paddings);
         setPadding(0, 0, 0,
                 getContext().getResources().getDimensionPixelSize(
                         R.dimen.qs_paged_tile_layout_padding_bottom));
@@ -351,7 +349,8 @@ public class PagedTileLayout extends ViewPager implements QSTileLayout {
     @Override
     protected void onLayout(boolean changed, int l, int t, int r, int b) {
         super.onLayout(changed, l, t, r, b);
-        mClippingRect.set(mHorizontalClipBound, 0, (r - l) - mHorizontalClipBound, b - t);
+        // Clip to margins
+        mClippingRect.set(0, 0, (r - l), b - t);
         setClipBounds(mClippingRect);
     }