summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2017-06-14 14:20:14 -0700
committerJon Miranda <jonmiranda@google.com>2017-06-19 17:02:45 -0700
commit0966072c91340990d61dfb29d31f7f19d7936f8f (patch)
treed15b647f3f4794bf807e124caa6149ea162887ad /res
parent663bb990f004137ae0c5a62cf378bed8d19f7db4 (diff)
downloadandroid_packages_apps_Trebuchet-0966072c91340990d61dfb29d31f7f19d7936f8f.tar.gz
android_packages_apps_Trebuchet-0966072c91340990d61dfb29d31f7f19d7936f8f.tar.bz2
android_packages_apps_Trebuchet-0966072c91340990d61dfb29d31f7f19d7936f8f.zip
Portrait grid changes for Workspace/All Apps.
Bug: 37015359 Change-Id: Ifbdd0e71c36e532b189e02283e3eeb562ebe2654
Diffstat (limited to 'res')
-rw-r--r--res/layout/all_apps_icon.xml5
-rw-r--r--res/layout/page_indicator.xml2
-rw-r--r--res/layout/qsb_default_view.xml2
-rw-r--r--res/values/dimens.xml11
4 files changed, 11 insertions, 9 deletions
diff --git a/res/layout/all_apps_icon.xml b/res/layout/all_apps_icon.xml
index ca0cbcc4d..79fb6126a 100644
--- a/res/layout/all_apps_icon.xml
+++ b/res/layout/all_apps_icon.xml
@@ -23,7 +23,6 @@
android:stateListAnimator="@animator/all_apps_fastscroll_icon_anim"
launcher:iconDisplay="all_apps"
launcher:centerVertically="true"
- android:paddingLeft="4dp"
- android:paddingRight="4dp"
- android:drawablePadding="@dimen/dynamic_grid_icon_drawable_padding" />
+ android:paddingLeft="@dimen/dynamic_grid_cell_padding_x"
+ android:paddingRight="@dimen/dynamic_grid_cell_padding_x" />
diff --git a/res/layout/page_indicator.xml b/res/layout/page_indicator.xml
index e29e5b162..c5ef6e0a8 100644
--- a/res/layout/page_indicator.xml
+++ b/res/layout/page_indicator.xml
@@ -23,6 +23,6 @@
android:id="@+id/all_apps_handle"
android:layout_width="48dp"
android:layout_height="match_parent"
- android:layout_gravity="center"
+ android:layout_gravity="top|center"
android:scaleType="centerInside"/>
</com.android.launcher3.pageindicators.PageIndicatorLineCaret>
diff --git a/res/layout/qsb_default_view.xml b/res/layout/qsb_default_view.xml
index 3075f803f..04fe23608 100644
--- a/res/layout/qsb_default_view.xml
+++ b/res/layout/qsb_default_view.xml
@@ -21,7 +21,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="48dp"
- android:layout_margin="16dp"
+ android:layout_margin="8dp"
android:layout_gravity="center_vertical"
android:background="@drawable/round_rect_primary"
android:elevation="2dp"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 57b4be4e2..8d6b501c2 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -16,8 +16,8 @@
<resources>
<!-- Dynamic Grid -->
- <dimen name="dynamic_grid_edge_margin">8dp</dimen>
- <dimen name="dynamic_grid_page_indicator_height">28dp</dimen>
+ <dimen name="dynamic_grid_edge_margin">16dp</dimen>
+ <dimen name="dynamic_grid_page_indicator_height">32dp</dimen>
<dimen name="dynamic_grid_page_indicator_line_height">1dp</dimen>
<dimen name="dynamic_grid_page_indicator_gutter_width_left_nav_bar">38dp</dimen>
<dimen name="dynamic_grid_page_indicator_gutter_width_right_nav_bar">48dp</dimen>
@@ -26,14 +26,17 @@
<dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen>
<dimen name="dynamic_grid_overview_bar_item_width">80dp</dimen>
<dimen name="dynamic_grid_overview_bar_spacer_width">25dp</dimen>
- <dimen name="dynamic_grid_workspace_top_padding">12dp</dimen>
+ <dimen name="dynamic_grid_workspace_top_padding">8dp</dimen>
<dimen name="dynamic_grid_workspace_page_spacing">8dp</dimen>
<!-- Minimum space between workspace and hotseat in spring loaded mode -->
<dimen name="dynamic_grid_min_spring_loaded_space">8dp</dimen>
+ <!-- dynamic_grid_edge_margin / 2 -->
+ <dimen name="dynamic_grid_cell_padding_x">8dp</dimen>
+
<!-- Hotseat -->
<dimen name="dynamic_grid_hotseat_top_padding">8dp</dimen>
- <dimen name="dynamic_grid_hotseat_bottom_padding">0dp</dimen>
+ <dimen name="dynamic_grid_hotseat_bottom_padding">2dp</dimen>
<dimen name="dynamic_grid_hotseat_height">80dp</dimen>
<dimen name="dynamic_grid_hotseat_land_gutter_width">24dp</dimen>