summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFabrice Di Meglio <fdimeglio@google.com>2014-06-05 17:36:45 -0700
committerFabrice Di Meglio <fdimeglio@google.com>2014-06-05 17:36:45 -0700
commiteb072e125bd757b3617f9fc648dbd6181f40789d (patch)
tree05bff8c09c82e4391986f5b15b816e98e7ba3868
parentc3febdf02f67dc057cfbadaa22a80708369da0a4 (diff)
downloadpackages_apps_Settings-eb072e125bd757b3617f9fc648dbd6181f40789d.zip
packages_apps_Settings-eb072e125bd757b3617f9fc648dbd6181f40789d.tar.gz
packages_apps_Settings-eb072e125bd757b3617f9fc648dbd6181f40789d.tar.bz2
Tune Dashboard layouts following UX spec - part 2
- set a fixed size for the Dashboard icons (and thus fix the Account type icons size isssue) - tune layout for N7 tablet See bug: #15384992 Setting Dashboard - padding updates Change-Id: I0306f1ec2309e859e044e8490cef468def8d38fb
-rw-r--r--res/layout/dashboard_tile.xml4
-rw-r--r--res/values-sw600dp-land/config.xml2
-rwxr-xr-xres/values-sw600dp/dimens.xml19
-rwxr-xr-xres/values/dimens.xml5
4 files changed, 20 insertions, 10 deletions
diff --git a/res/layout/dashboard_tile.xml b/res/layout/dashboard_tile.xml
index 8d65666..80c3a26 100644
--- a/res/layout/dashboard_tile.xml
+++ b/res/layout/dashboard_tile.xml
@@ -23,8 +23,8 @@
<ImageView
android:id="@+id/icon"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
+ android:layout_width="@dimen/dashboard_tile_image_size"
+ android:layout_height="@dimen/dashboard_tile_image_size"
android:scaleType="centerInside"
android:layout_marginStart="@dimen/dashboard_tile_image_margin_start"
android:layout_marginEnd="@dimen/dashboard_tile_image_margin_end"
diff --git a/res/values-sw600dp-land/config.xml b/res/values-sw600dp-land/config.xml
index eb1a7c3..543dfee 100644
--- a/res/values-sw600dp-land/config.xml
+++ b/res/values-sw600dp-land/config.xml
@@ -17,6 +17,6 @@
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- Dashboard number of columns -->
- <integer name="dashboard_num_columns">3</integer>
+ <integer name="dashboard_num_columns">2</integer>
</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 76ce998..6108213 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -39,15 +39,22 @@
<dimen name="keyguard_appwidget_picker_margin_right">2dip</dimen>
<integer name="keyguard_appwidget_picker_cols">2</integer>
- <!-- Dashboard padding between each tiles within the layout -->
- <dimen name="dashboard_cell_gap">8dp</dimen>
+ <!-- ActionBar contentInsetStart -->
+ <dimen name="actionbar_contentInsetStart">24dp</dimen>
+
+ <!-- Dashboard category title padding start -->
+ <dimen name="dashboard_category_title_padding_start">24dp</dimen>
+
+ <!-- Dashboard image tile padding start / end -->
+ <dimen name="dashboard_tile_image_margin_start">24dp</dimen>
+ <dimen name="dashboard_tile_image_margin_end">32dp</dimen>
<!-- SwitchBar padding start -->
- <dimen name="switchbar_padding_start">80dp</dimen>
+ <dimen name="switchbar_padding_start">24dp</dimen>
<!-- SwitchBar padding end -->
- <dimen name="switchbar_padding_end">80dp</dimen>
+ <dimen name="switchbar_padding_end">24dp</dimen>
- <!-- ActionBar contentInsetStart -->
- <dimen name="actionbar_contentInsetStart">80dp</dimen>
+ <!-- Search title (recent / results) padding start -->
+ <dimen name="search_title_padding_start">24dp</dimen>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 11213bc..d957d8b 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -106,6 +106,9 @@
<!-- Dashboard tile minimum height -->
<dimen name="dashboard_tile_minimum_height">72dp</dimen>
+ <!-- Dashboard image tile size -->
+ <dimen name="dashboard_tile_image_size">24dp</dimen>
+
<!-- Dashboard image tile padding start / end -->
<dimen name="dashboard_tile_image_margin_start">16dp</dimen>
<dimen name="dashboard_tile_image_margin_end">32dp</dimen>
@@ -120,6 +123,6 @@
<dimen name="search_results_padding_end">1dp</dimen>
<!-- Search title (recent / results) padding start -->
- <dimen name="search_title_padding_start">12dp</dimen>
+ <dimen name="search_title_padding_start">16dp</dimen>
</resources>