diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-01-04 15:35:22 -0800 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-01-08 13:53:44 -0800 |
commit | 228153d92ae68c82efd3fcad4ad3df6af7fc24a2 (patch) | |
tree | f5b51dd0d43fee9de5b204f12244a860221dd9a4 /res | |
parent | 07b1d670f21745525c4a6df1cf8c2172ad9bdec2 (diff) | |
download | android_packages_apps_Trebuchet-228153d92ae68c82efd3fcad4ad3df6af7fc24a2.tar.gz android_packages_apps_Trebuchet-228153d92ae68c82efd3fcad4ad3df6af7fc24a2.tar.bz2 android_packages_apps_Trebuchet-228153d92ae68c82efd3fcad4ad3df6af7fc24a2.zip |
Updating landscape layout for launcher/quickstep
> Hotseat is tied to navbar (on left in seascape)
> Search box shows up in Overview (clicking it would crash for now)
> All-apps is no longer fullscreen in landscape
> Recents cards are appropriately scaled down
> Hotseat is visible in Overview
Bug: 70179916
Change-Id: I53149eaeac9557e8a01021b7e2d139f3d6ceef37
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/all_apps_fast_scroller.xml | 39 | ||||
-rw-r--r-- | res/layout-land/launcher.xml | 3 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 3 | ||||
-rw-r--r-- | res/layout-sw720dp/all_apps_fast_scroller.xml | 37 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 3 | ||||
-rw-r--r-- | res/values-land/dimens.xml | 13 | ||||
-rw-r--r-- | res/values/dimens.xml | 11 |
7 files changed, 5 insertions, 104 deletions
diff --git a/res/layout-land/all_apps_fast_scroller.xml b/res/layout-land/all_apps_fast_scroller.xml deleted file mode 100644 index 16aa2afd4..000000000 --- a/res/layout-land/all_apps_fast_scroller.xml +++ /dev/null @@ -1,39 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<merge - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto"> - <!-- Fast scroller popup --> - <TextView - android:id="@+id/fast_scroller_popup" - style="@style/FastScrollerPopup" - android:layout_alignParentEnd="true" - android:layout_below="@+id/search_container_all_apps" - android:layout_marginTop="-5dp" - android:layout_marginEnd="-45dp" /> - - <com.android.launcher3.allapps.LandscapeFastScroller - android:id="@+id/fast_scroller" - android:layout_width="48dp" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" - android:layout_below="@+id/search_container_all_apps" - android:layout_marginEnd="-88dp" - android:layout_marginTop="14dp" - launcher:canThumbDetach="true" /> - -</merge>
\ No newline at end of file diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index 0a4fec127..3422a9849 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -57,8 +57,7 @@ <com.android.launcher3.views.AllAppsScrim android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/all_apps_scrim" - launcher:layout_ignoreInsets="true" /> + android:id="@+id/all_apps_scrim" /> <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml index 33b350acd..53743e804 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -51,8 +51,7 @@ <com.android.launcher3.views.AllAppsScrim android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/all_apps_scrim" - launcher:layout_ignoreInsets="true" /> + android:id="@+id/all_apps_scrim" /> <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" diff --git a/res/layout-sw720dp/all_apps_fast_scroller.xml b/res/layout-sw720dp/all_apps_fast_scroller.xml deleted file mode 100644 index 5537bc60a..000000000 --- a/res/layout-sw720dp/all_apps_fast_scroller.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> -<merge - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto"> - <!-- Fast scroller popup --> - <TextView - android:id="@+id/fast_scroller_popup" - style="@style/FastScrollerPopup" - android:layout_alignParentEnd="true" - android:layout_below="@+id/search_container_all_apps" - android:layout_marginEnd="@dimen/fastscroll_popup_margin" /> - - <com.android.launcher3.views.RecyclerViewFastScroller - android:id="@+id/fast_scroller" - android:layout_width="@dimen/fastscroll_width" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" - android:layout_below="@+id/search_container_all_apps" - android:layout_marginEnd="@dimen/fastscroll_end_margin" - launcher:canThumbDetach="true" /> - -</merge>
\ No newline at end of file diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml index d7e931a36..047577ba7 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -50,8 +50,7 @@ <com.android.launcher3.views.AllAppsScrim android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/all_apps_scrim" - launcher:layout_ignoreInsets="true" /> + android:id="@+id/all_apps_scrim" /> <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" diff --git a/res/values-land/dimens.xml b/res/values-land/dimens.xml index 92420a2f1..40ffffe12 100644 --- a/res/values-land/dimens.xml +++ b/res/values-land/dimens.xml @@ -35,19 +35,8 @@ <!-- 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_side_padding">16dp</dimen> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index e10719b5a..f53fe7985 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -22,8 +22,6 @@ <dimen name="dynamic_grid_edge_margin">8dp</dimen> <dimen name="dynamic_grid_min_page_indicator_size">24dp</dimen> <dimen name="dynamic_grid_page_indicator_line_height">1dp</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> @@ -42,13 +40,7 @@ <dimen name="dynamic_grid_hotseat_top_padding">8dp</dimen> <dimen name="dynamic_grid_hotseat_bottom_padding">2dp</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> + <dimen name="dynamic_grid_hotseat_side_padding">0dp</dimen> <!-- Hotseat/all-apps scrim --> <dimen name="all_apps_scrim_radius">10dp</dimen> @@ -93,7 +85,6 @@ <dimen name="all_apps_empty_search_bg_top_offset">144dp</dimen> <dimen name="all_apps_background_canvas_width">700dp</dimen> <dimen name="all_apps_background_canvas_height">475dp</dimen> - <dimen name="all_apps_caret_workspace_offset">18dp</dimen> <dimen name="all_apps_header_tab_height">50dp</dimen> <dimen name="all_apps_tabs_indicator_height">2dp</dimen> <dimen name="all_apps_header_top_padding">36dp</dimen> |