From c4a9b181219468e202dfc99e5d0600c93be6f9bb Mon Sep 17 00:00:00 2001
From: Matthew Fritze <mfritze@google.com>
Date: Wed, 28 Sep 2016 14:30:17 -0700
Subject: [PATCH] Tablet Settings Layout is no longer stretched

Change-Id: If4a883077f41b859f4e8aaf92a4f397b94814137
Fixes: 31583422
Tests: Visual Inspection
---
 res/layout/dashboard_container_header.xml             | 2 ++
 res/layout/settings_main_dashboard.xml                | 1 +
 res/layout/support_tile_spacer.xml                    | 2 +-
 res/values-sw720dp-land/dimens.xml                    | 8 ++++++--
 res/values-sw720dp/dimens.xml                         | 4 ++++
 res/values/dimens.xml                                 | 4 ++++
 src/com/android/settings/widget/SlidingTabLayout.java | 6 ++++--
 7 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/res/layout/dashboard_container_header.xml b/res/layout/dashboard_container_header.xml
index a12f2498cb6..59e7eb18100 100644
--- a/res/layout/dashboard_container_header.xml
+++ b/res/layout/dashboard_container_header.xml
@@ -20,4 +20,6 @@
     android:id="@+id/sliding_tabs"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:layout_marginLeft="@dimen/dashboard_header_margin_left"
+    android:layout_marginRight="@dimen/dashboard_header_margin_right"
     android:background="?android:attr/colorPrimary"/>
diff --git a/res/layout/settings_main_dashboard.xml b/res/layout/settings_main_dashboard.xml
index c10193cda90..1b7506ea9a4 100644
--- a/res/layout/settings_main_dashboard.xml
+++ b/res/layout/settings_main_dashboard.xml
@@ -21,4 +21,5 @@
              android:id="@+id/main_content"
              android:layout_height="match_parent"
              android:layout_width="match_parent"
+             android:background="@color/material_grey_300"
              />
diff --git a/res/layout/support_tile_spacer.xml b/res/layout/support_tile_spacer.xml
index 95aea0b87c2..41cc22176b3 100644
--- a/res/layout/support_tile_spacer.xml
+++ b/res/layout/support_tile_spacer.xml
@@ -15,7 +15,7 @@
      limitations under the License.
 -->
 
-<Space
+<View
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="@dimen/support_spacer_height"
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
index 56d8318061f..d924344be29 100644
--- a/res/values-sw720dp-land/dimens.xml
+++ b/res/values-sw720dp-land/dimens.xml
@@ -18,8 +18,12 @@
     <dimen name="settings_side_margin">112dp</dimen>
 
     <!-- Dashboard padding in its container -->
-    <dimen name="dashboard_padding_start">128dp</dimen>
-    <dimen name="dashboard_padding_end">128dp</dimen>
+    <dimen name="dashboard_padding_start">160dp</dimen>
+    <dimen name="dashboard_padding_end">160dp</dimen>
+
+    <!-- Dashboard Header margin in its container -->
+    <dimen name="dashboard_header_margin_right">304dp</dimen>
+    <dimen name="dashboard_header_margin_left">304dp</dimen>
 
     <!-- ActionBar contentInsetStart -->
     <dimen name="actionbar_contentInsetStart">128dp</dimen>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 981c93602c9..0a2a1ce928b 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -42,6 +42,10 @@
     <dimen name="dashboard_padding_start">80dp</dimen>
     <dimen name="dashboard_padding_end">80dp</dimen>
 
+    <!-- Dashboard Header margin in its container -->
+    <dimen name="dashboard_header_margin_right">176dp</dimen>
+    <dimen name="dashboard_header_margin_left">176dp</dimen>
+
     <!-- Dashboard category padding start / end -->
     <dimen name="dashboard_category_padding_start">24dp</dimen>
     <dimen name="dashboard_category_padding_end">24dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 2a2b40675e7..74441c20448 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -96,6 +96,10 @@
     <dimen name="dashboard_padding_top">0dp</dimen>
     <dimen name="dashboard_padding_bottom">0dp</dimen>
 
+    <!-- Dashboard Header margin in its container -->
+    <dimen name="dashboard_header_margin_right">0dp</dimen>
+    <dimen name="dashboard_header_margin_left">0dp</dimen>
+
     <!-- Dashboard category padding start / end -->
     <dimen name="dashboard_category_padding_start">0dp</dimen>
     <dimen name="dashboard_category_padding_end">0dp</dimen>
diff --git a/src/com/android/settings/widget/SlidingTabLayout.java b/src/com/android/settings/widget/SlidingTabLayout.java
index 6e2d8c6be63..709964640ea 100644
--- a/src/com/android/settings/widget/SlidingTabLayout.java
+++ b/src/com/android/settings/widget/SlidingTabLayout.java
@@ -83,19 +83,21 @@ public final class SlidingTabLayout extends FrameLayout implements View.OnClickL
     @Override
     protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
         if (mTitleView.getChildCount() > 0) {
-            mTitleView.layout(0, 0, mTitleView.getMeasuredWidth(), mTitleView.getMeasuredHeight());
             final int indicatorBottom = getMeasuredHeight();
             final int indicatorHeight = mIndicatorView.getMeasuredHeight();
             final int indicatorWidth = mIndicatorView.getMeasuredWidth();
             final int totalWidth = getMeasuredWidth();
+            final int leftPadding = getPaddingLeft();
+            final int rightPadding = getPaddingRight();
 
+            mTitleView.layout(leftPadding, 0, mTitleView.getMeasuredWidth() + rightPadding,
+                    mTitleView.getMeasuredHeight());
             // IndicatorView should start on the right when RTL mode is enabled
             if (isRtlMode()) {
                 mIndicatorView.layout(totalWidth - indicatorWidth,
                         indicatorBottom - indicatorHeight, totalWidth,
                         indicatorBottom);
             } else {
-
                 mIndicatorView.layout(0, indicatorBottom - indicatorHeight,
                         indicatorWidth, indicatorBottom);
             }