diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-06-23 18:59:11 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-06-23 18:59:12 +0000 |
commit | 6828cbb7515eeaccd96f481232e252b9bc47d512 (patch) | |
tree | a9a2f94609945c9f7751d32b363787fe6a34b871 /res | |
parent | 9314b7c01d932093c730dd39b9b9842d1a56efdb (diff) | |
parent | b28c4fcf351dc9f44f69253b227880758f6b460c (diff) | |
download | android_packages_apps_Trebuchet-6828cbb7515eeaccd96f481232e252b9bc47d512.tar.gz android_packages_apps_Trebuchet-6828cbb7515eeaccd96f481232e252b9bc47d512.tar.bz2 android_packages_apps_Trebuchet-6828cbb7515eeaccd96f481232e252b9bc47d512.zip |
Merge "Landscape grid changes for Workspace/All Apps." into ub-launcher3-dorval-polish
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/launcher.xml | 4 | ||||
-rw-r--r-- | res/layout/all_apps.xml | 4 | ||||
-rw-r--r-- | res/layout/page_indicator.xml | 2 | ||||
-rw-r--r-- | res/values-land/dimens.xml | 11 | ||||
-rw-r--r-- | res/values/attrs.xml | 4 | ||||
-rw-r--r-- | res/values/dimens.xml | 12 | ||||
-rw-r--r-- | res/xml/device_profiles.xml | 19 |
7 files changed, 28 insertions, 28 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 2e0357672..2bbd76d52 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -63,8 +63,8 @@ <com.android.launcher3.pageindicators.PageIndicatorCaretLandscape android:id="@+id/page_indicator" android:theme="@style/HomeScreenElementTheme" - android:layout_width="@dimen/dynamic_grid_page_indicator_height" - android:layout_height="@dimen/dynamic_grid_page_indicator_height" + android:layout_width="@dimen/dynamic_grid_page_indicator_size" + android:layout_height="@dimen/dynamic_grid_page_indicator_size" android:layout_gravity="bottom|left"/> <include layout="@layout/widgets_view" diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index ff605f4bb..a3c253537 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -53,9 +53,7 @@ android:clipToPadding="false" android:overScrollMode="never" android:descendantFocusability="afterDescendants" - android:focusable="true" - android:paddingStart="@dimen/dynamic_grid_edge_margin" - android:paddingEnd="@dimen/dynamic_grid_edge_margin" /> + android:focusable="true" /> <!-- Fast scroller popup --> <TextView diff --git a/res/layout/page_indicator.xml b/res/layout/page_indicator.xml index c5ef6e0a8..14ff2bd28 100644 --- a/res/layout/page_indicator.xml +++ b/res/layout/page_indicator.xml @@ -18,7 +18,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" android:theme="@style/HomeScreenElementTheme" android:layout_width="match_parent" - android:layout_height="@dimen/dynamic_grid_page_indicator_height"> + android:layout_height="@dimen/dynamic_grid_page_indicator_size"> <ImageView android:id="@+id/all_apps_handle" android:layout_width="48dp" diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index b40aa14ac..08073ce0d 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -24,4 +24,15 @@ <dimen name="fastscroll_popup_padding">10dp</dimen> <dimen name="fastscroll_popup_text_size">24dp</dimen> + <!-- Dynamic grid --> + <dimen name="dynamic_grid_overview_bar_item_width">120dp</dimen> + <dimen name="dynamic_grid_page_indicator_size">24dp</dimen> + <dimen name="dynamic_grid_icon_drawable_padding">8dp</dimen> + <dimen name="dynamic_grid_cell_padding_x">8dp</dimen> + + <!-- Hotseat --> + <dimen name="dynamic_grid_hotseat_land_left_nav_bar_right_padding">18dp</dimen> + <dimen name="dynamic_grid_hotseat_land_right_nav_bar_right_padding">6dp</dimen> + <dimen name="dynamic_grid_hotseat_land_left_nav_bar_gutter_width">24dp</dimen> + <dimen name="dynamic_grid_hotseat_land_right_nav_bar_gutter_width">32dp</dimen> </resources> diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 05e66ad91..7929e65d1 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -116,9 +116,9 @@ <attr name="numHotseatIcons" format="integer" /> <attr name="iconSize" format="float" /> + <!-- landscapeIconSize defaults to iconSize, if not specified --> + <attr name="landscapeIconSize" format="float" /> <attr name="iconTextSize" format="float" /> - <!-- hotseatIconSize defaults to iconSize, if not specified --> - <attr name="hotseatIconSize" format="float" /> <attr name="defaultLayoutId" format="reference" /> </declare-styleable> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index b90de82c1..71f9edc91 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -17,10 +17,9 @@ <resources> <!-- Dynamic Grid --> <dimen name="dynamic_grid_edge_margin">16dp</dimen> - <dimen name="dynamic_grid_page_indicator_height">32dp</dimen> + <dimen name="dynamic_grid_page_indicator_size">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> + <dimen name="dynamic_grid_page_indicator_gutter_width">50dp</dimen> <dimen name="dynamic_grid_icon_drawable_padding">8dp</dimen> <dimen name="dynamic_grid_overview_min_icon_zone_height">80dp</dimen> <dimen name="dynamic_grid_overview_max_icon_zone_height">120dp</dimen> @@ -38,7 +37,10 @@ <dimen name="dynamic_grid_hotseat_top_padding">8dp</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> + <dimen name="dynamic_grid_hotseat_land_left_nav_bar_right_padding">0dp</dimen> + <dimen name="dynamic_grid_hotseat_land_right_nav_bar_right_padding">0dp</dimen> + <dimen name="dynamic_grid_hotseat_land_left_nav_bar_gutter_width">0dp</dimen> + <dimen name="dynamic_grid_hotseat_land_right_nav_bar_gutter_width">0dp</dimen> <!-- Drop target bar --> <dimen name="dynamic_grid_drop_target_size">48dp</dimen> @@ -74,7 +76,7 @@ <dimen name="all_apps_caret_stroke_width">2dp</dimen> <dimen name="all_apps_caret_shadow_spread">1dp</dimen> <dimen name="all_apps_caret_size">13dp</dimen> - <dimen name="all_apps_caret_workspace_offset">4dp</dimen> + <dimen name="all_apps_caret_workspace_offset">18dp</dimen> <!-- Search bar in All Apps --> <dimen name="all_apps_header_max_elevation">3dp</dimen> diff --git a/res/xml/device_profiles.xml b/res/xml/device_profiles.xml index aeda1a2b0..c582fc557 100644 --- a/res/xml/device_profiles.xml +++ b/res/xml/device_profiles.xml @@ -29,7 +29,6 @@ launcher:iconSize="48" launcher:iconTextSize="13.0" launcher:numHotseatIcons="3" - launcher:hotseatIconSize="48" launcher:defaultLayoutId="@xml/default_workspace_3x3" /> @@ -45,7 +44,6 @@ launcher:iconSize="48" launcher:iconTextSize="13.0" launcher:numHotseatIcons="3" - launcher:hotseatIconSize="48" launcher:defaultLayoutId="@xml/default_workspace_3x3" /> @@ -61,7 +59,6 @@ launcher:iconSize="48" launcher:iconTextSize="13.0" launcher:numHotseatIcons="5" - launcher:hotseatIconSize="48" launcher:defaultLayoutId="@xml/default_workspace_4x4" /> @@ -77,7 +74,6 @@ launcher:iconSize="48" launcher:iconTextSize="13.0" launcher:numHotseatIcons="5" - launcher:hotseatIconSize="48" launcher:defaultLayoutId="@xml/default_workspace_4x4" /> @@ -93,7 +89,6 @@ launcher:iconSize="48" launcher:iconTextSize="13.0" launcher:numHotseatIcons="5" - launcher:hotseatIconSize="48" launcher:defaultLayoutId="@xml/default_workspace_4x4" /> @@ -106,10 +101,9 @@ launcher:numFolderRows="4" launcher:numFolderColumns="4" launcher:minAllAppsPredictionColumns="4" - launcher:iconSize="60" + launcher:iconSize="54" launcher:iconTextSize="13.0" launcher:numHotseatIcons="5" - launcher:hotseatIconSize="56" launcher:defaultLayoutId="@xml/default_workspace_4x4" /> @@ -122,10 +116,9 @@ launcher:numFolderRows="4" launcher:numFolderColumns="4" launcher:minAllAppsPredictionColumns="4" - launcher:iconSize="60" + launcher:iconSize="54" launcher:iconTextSize="13.0" launcher:numHotseatIcons="5" - launcher:hotseatIconSize="56" launcher:defaultLayoutId="@xml/default_workspace_4x4" /> @@ -138,10 +131,9 @@ launcher:numFolderRows="4" launcher:numFolderColumns="4" launcher:minAllAppsPredictionColumns="4" - launcher:iconSize="64" + launcher:iconSize="56" launcher:iconTextSize="14.4" launcher:numHotseatIcons="5" - launcher:hotseatIconSize="56" launcher:defaultLayoutId="@xml/default_workspace_5x5" /> @@ -154,10 +146,9 @@ launcher:numFolderRows="4" launcher:numFolderColumns="5" launcher:minAllAppsPredictionColumns="4" - launcher:iconSize="72" + launcher:iconSize="64" launcher:iconTextSize="14.4" launcher:numHotseatIcons="7" - launcher:hotseatIconSize="60" launcher:defaultLayoutId="@xml/default_workspace_5x6" /> @@ -173,7 +164,6 @@ launcher:iconSize="76" launcher:iconTextSize="14.4" launcher:numHotseatIcons="7" - launcher:hotseatIconSize="76" launcher:defaultLayoutId="@xml/default_workspace_5x6" /> @@ -189,7 +179,6 @@ launcher:iconSize="100" launcher:iconTextSize="20.0" launcher:numHotseatIcons="7" - launcher:hotseatIconSize="72" launcher:defaultLayoutId="@xml/default_workspace_5x6" /> |