diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-02 00:12:37 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-02 00:12:37 +0000 |
commit | 39c6de4374fe6a12483620ab7cf4eb0cd0dde3ac (patch) | |
tree | fe18a9ea96fa69f5f41546825fe7a07486e88b02 /res | |
parent | b65e13ca837376e9712f31fdf947bad23b1107ef (diff) | |
parent | 18751b649d02fd1e613c294e52193623b42f69e7 (diff) | |
download | android_packages_apps_Trebuchet-39c6de4374fe6a12483620ab7cf4eb0cd0dde3ac.tar.gz android_packages_apps_Trebuchet-39c6de4374fe6a12483620ab7cf4eb0cd0dde3ac.tar.bz2 android_packages_apps_Trebuchet-39c6de4374fe6a12483620ab7cf4eb0cd0dde3ac.zip |
Merge "Landscape launcher grid/all apps to spec." into ub-launcher3-dorval-polish
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/all_apps_fast_scroller.xml | 9 | ||||
-rw-r--r-- | res/values-land/dimens.xml | 16 | ||||
-rw-r--r-- | res/values/dimens.xml | 10 |
3 files changed, 27 insertions, 8 deletions
diff --git a/res/layout-land/all_apps_fast_scroller.xml b/res/layout-land/all_apps_fast_scroller.xml index 957c33174..6a68f84e9 100644 --- a/res/layout-land/all_apps_fast_scroller.xml +++ b/res/layout-land/all_apps_fast_scroller.xml @@ -22,7 +22,8 @@ style="@style/FastScrollerPopup" android:layout_alignParentEnd="true" android:layout_alignTop="@+id/apps_list_view" - android:layout_marginEnd="-5dp" /> + android:layout_marginTop="-5dp" + android:layout_marginEnd="-45dp" /> <com.android.launcher3.allapps.LandscapeFastScroller android:id="@+id/fast_scroller" @@ -30,9 +31,9 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:layout_alignParentEnd="true" - android:layout_alignTop="@+id/apps_list_view" - android:layout_marginEnd="-48dp" - android:layout_marginTop="-8dp" + android:layout_alignParentTop="@+id/apps_list_view" + android:layout_marginEnd="-88dp" + android:layout_marginTop="14dp" launcher:canThumbDetach="true" /> </merge>
\ No newline at end of file diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 1b58e1775..92420a2f1 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -30,12 +30,24 @@ <dimen name="dynamic_grid_icon_drawable_padding">4dp</dimen> <dimen name="dynamic_grid_cell_layout_padding">0dp</dimen> + <dimen name="dynamic_grid_cell_layout_bottom_padding">5.5dp</dimen> + <!-- Folders --> <dimen name="folder_preview_padding">2dp</dimen> + <!-- Page indicator --> + <dimen name="dynamic_grid_page_indicator_land_left_nav_bar_gutter_width">50dp</dimen> + <dimen name="dynamic_grid_page_indicator_land_right_nav_bar_gutter_width">74dp</dimen> + <!-- Hotseat --> + <!-- Will be set to equal the hotseat icon size. --> + <dimen name="dynamic_grid_hotseat_size">0dp</dimen> + + <dimen name="dynamic_grid_hotseat_land_left_nav_bar_gutter_width">50dp</dimen> + <dimen name="dynamic_grid_hotseat_land_left_nav_bar_left_padding">44dp</dimen> <dimen name="dynamic_grid_hotseat_land_left_nav_bar_right_padding">18dp</dimen> + + <dimen name="dynamic_grid_hotseat_land_right_nav_bar_gutter_width">56dp</dimen> + <dimen name="dynamic_grid_hotseat_land_right_nav_bar_left_padding">32dp</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/dimens.xml b/res/values/dimens.xml index 28af70596..3f6efd794 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -19,7 +19,8 @@ <dimen name="dynamic_grid_edge_margin">8dp</dimen> <dimen name="dynamic_grid_min_page_indicator_size">32dp</dimen> <dimen name="dynamic_grid_page_indicator_line_height">1dp</dimen> - <dimen name="dynamic_grid_page_indicator_gutter_width">50dp</dimen> + <dimen name="dynamic_grid_page_indicator_land_left_nav_bar_gutter_width">0dp</dimen> + <dimen name="dynamic_grid_page_indicator_land_right_nav_bar_gutter_width">0dp</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> @@ -31,16 +32,21 @@ <dimen name="dynamic_grid_min_spring_loaded_space">8dp</dimen> <dimen name="dynamic_grid_cell_layout_padding">5.5dp</dimen> + <dimen name="dynamic_grid_cell_layout_bottom_padding">0dp</dimen> <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">2dp</dimen> - <dimen name="dynamic_grid_hotseat_height">80dp</dimen> + <dimen name="dynamic_grid_hotseat_size">80dp</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> + <dimen name="dynamic_grid_hotseat_land_left_nav_bar_left_padding">0dp</dimen> + <dimen name="dynamic_grid_hotseat_land_right_nav_bar_left_padding">0dp</dimen> + <!-- Drop target bar --> <dimen name="dynamic_grid_drop_target_size">48dp</dimen> |