From 855d408e17612beadfc637496f50b03a7149515a Mon Sep 17 00:00:00 2001
From: Jason Monk <jmonk@google.com>
Date: Sun, 21 Feb 2016 10:57:10 -0500
Subject: [PATCH] Fix edit/page indicator area layout

Bug: 27201532
Change-Id: Ie03e6aeeb9d607f1fba370a4f1bd23a2ffb9b485
---
 packages/SystemUI/res/layout/qs_paged_tile_layout.xml         | 2 +-
 packages/SystemUI/src/com/android/systemui/qs/TileLayout.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/res/layout/qs_paged_tile_layout.xml b/packages/SystemUI/res/layout/qs_paged_tile_layout.xml
index c80d31d1100e9..9dd3ad284217b 100644
--- a/packages/SystemUI/res/layout/qs_paged_tile_layout.xml
+++ b/packages/SystemUI/res/layout/qs_paged_tile_layout.xml
@@ -25,7 +25,7 @@
     <FrameLayout
         android:id="@+id/page_decor"
         android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_height="48dp"
         android:layout_gravity="bottom">
 
         <com.android.systemui.qs.PageIndicator
diff --git a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
index f7e2338e9be95..55eda98386649 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/TileLayout.java
@@ -81,7 +81,7 @@ public class TileLayout extends ViewGroup implements QSTileLayout {
             record.tileView.measure(exactly(mCellWidth), exactly(mCellHeight));
             previousView = record.tileView.updateAccessibilityOrder(previousView);
         }
-        setMeasuredDimension(width, (mCellHeight + mCellMargin) * rows + mCellMargin);
+        setMeasuredDimension(width, (mCellHeight + mCellMargin) * rows);
     }
 
     private static int exactly(int size) {