summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-06-29 14:49:56 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2014-06-29 14:54:07 -0700
commit1575ee7d0230639b15d79cb8234a33193ae588ca (patch)
treef662e077cef350c6017f03cb369add62d8157532
parent006b2cca1311e61472a8b66fb0c50854fc36d2e7 (diff)
downloadpackages_apps_Settings-1575ee7d0230639b15d79cb8234a33193ae588ca.zip
packages_apps_Settings-1575ee7d0230639b15d79cb8234a33193ae588ca.tar.gz
packages_apps_Settings-1575ee7d0230639b15d79cb8234a33193ae588ca.tar.bz2
Make edge effect goes border to border on xlarge tablets
- it is all where you apply the padding ... Change-Id: Ia8b75662a387bee278b4ea1bca83153724db5bfa
-rw-r--r--res/layout/dashboard.xml4
-rwxr-xr-xres/values-land/dimens.xml6
-rwxr-xr-xres/values-sw600dp/dimens.xml6
-rw-r--r--res/values-sw720dp-land/dimens.xml5
-rw-r--r--res/values-sw720dp/dimens.xml9
-rwxr-xr-xres/values/dimens.xml3
6 files changed, 6 insertions, 27 deletions
diff --git a/res/layout/dashboard.xml b/res/layout/dashboard.xml
index 3c5fc88..391e3e2 100644
--- a/res/layout/dashboard.xml
+++ b/res/layout/dashboard.xml
@@ -19,8 +19,6 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbarStyle="outsideOverlay"
- android:paddingStart="@dimen/dashboard_side_margin"
- android:paddingEnd="@dimen/dashboard_side_margin"
android:clipToPadding="false"
android:background="@color/dashboard_background_color">
@@ -28,11 +26,11 @@
android:id="@+id/dashboard_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:layout_gravity="center_horizontal"
android:paddingStart="@dimen/dashboard_padding_start"
android:paddingEnd="@dimen/dashboard_padding_end"
android:paddingTop="@dimen/dashboard_padding_top"
android:paddingBottom="@dimen/dashboard_padding_bottom"
- android:layout_gravity="center_horizontal"
android:orientation="vertical"
/>
diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml
index 2c8f92d..d8d75e2 100755
--- a/res/values-land/dimens.xml
+++ b/res/values-land/dimens.xml
@@ -32,12 +32,6 @@
<dimen name="dashboard_cell_gap_x">8dp</dimen>
<dimen name="dashboard_cell_gap_y">0dp</dimen>
- <!-- Dashboard padding in its container -->
- <dimen name="dashboard_padding_start">0dp</dimen>
- <dimen name="dashboard_padding_end">0dp</dimen>
- <dimen name="dashboard_padding_top">0dp</dimen>
- <dimen name="dashboard_padding_bottom">0dp</dimen>
-
<!-- Dashboard category padding start / end -->
<dimen name="dashboard_category_padding_start">4dp</dimen>
<dimen name="dashboard_category_padding_end">4dp</dimen>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index f70b4dc..ffd6ac0 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -49,12 +49,6 @@
<dimen name="dashboard_cell_gap_x">16dp</dimen>
<dimen name="dashboard_cell_gap_y">0dp</dimen>
- <!-- Dashboard padding in its container -->
- <dimen name="dashboard_padding_start">0dp</dimen>
- <dimen name="dashboard_padding_end">0dp</dimen>
- <dimen name="dashboard_padding_top">0dp</dimen>
- <dimen name="dashboard_padding_bottom">0dp</dimen>
-
<!-- Dashboard category padding start / end -->
<dimen name="dashboard_category_padding_start">16dp</dimen>
<dimen name="dashboard_category_padding_end">24dp</dimen>
diff --git a/res/values-sw720dp-land/dimens.xml b/res/values-sw720dp-land/dimens.xml
index 21fb4bb..56d8318 100644
--- a/res/values-sw720dp-land/dimens.xml
+++ b/res/values-sw720dp-land/dimens.xml
@@ -17,8 +17,9 @@
<resources>
<dimen name="settings_side_margin">112dp</dimen>
- <!-- Dashboard side margins (left and right) -->
- <dimen name="dashboard_side_margin">128dp</dimen>
+ <!-- Dashboard padding in its container -->
+ <dimen name="dashboard_padding_start">128dp</dimen>
+ <dimen name="dashboard_padding_end">128dp</dimen>
<!-- ActionBar contentInsetStart -->
<dimen name="actionbar_contentInsetStart">128dp</dimen>
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index c75a2bd..b1d084f 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -34,18 +34,13 @@
<dimen name="actionbar_contentInsetStart">80dp</dimen>
<dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen>
- <!-- Dashboard side margins (left and right) -->
- <dimen name="dashboard_side_margin">80dp</dimen>
-
<!-- Dashboard margins between each tiles within the layout -->
<dimen name="dashboard_cell_gap_x">24dp</dimen>
<dimen name="dashboard_cell_gap_y">0dp</dimen>
<!-- Dashboard padding in its container -->
- <dimen name="dashboard_padding_start">0dp</dimen>
- <dimen name="dashboard_padding_end">0dp</dimen>
- <dimen name="dashboard_padding_top">0dp</dimen>
- <dimen name="dashboard_padding_bottom">0dp</dimen>
+ <dimen name="dashboard_padding_start">80dp</dimen>
+ <dimen name="dashboard_padding_end">80dp</dimen>
<!-- Dashboard category padding start / end -->
<dimen name="dashboard_category_padding_start">24dp</dimen>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index de53006..cbe42f8 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -97,9 +97,6 @@
<dimen name="actionbar_contentInsetStart">16dp</dimen>
<dimen name="actionbar_subsettings_contentInsetStart">72dp</dimen>
- <!-- Dashboard side margins (left and right) -->
- <dimen name="dashboard_side_margin">0dp</dimen>
-
<!-- Dashboard margins between each tiles within the layout -->
<dimen name="dashboard_cell_gap_x">0dp</dimen>
<dimen name="dashboard_cell_gap_y">0dp</dimen>