summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/launcher.xml6
-rw-r--r--res/layout-port/launcher.xml6
-rw-r--r--res/layout-sw720dp/launcher.xml6
-rw-r--r--res/layout/all_apps.xml8
-rw-r--r--res/values/dimens.xml5
5 files changed, 20 insertions, 11 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index d21e45d99..f6bdd2580 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -50,7 +50,11 @@
android:layout_gravity="bottom|left"
android:background="@drawable/all_apps_handle_landscape" />
- <include layout="@layout/gradient_bg" />
+ <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" />
<!-- DO NOT CHANGE THE ID -->
<include layout="@layout/hotseat"
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index f58a87ecd..5d670e625 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -44,7 +44,11 @@
launcher:pageIndicator="@+id/page_indicator">
</com.android.launcher3.Workspace>
- <include layout="@layout/gradient_bg" />
+ <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" />
<!-- DO NOT CHANGE THE ID -->
<include layout="@layout/hotseat"
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 660d0ed14..483fb96c2 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -43,7 +43,11 @@
launcher:pageIndicator="@id/page_indicator">
</com.android.launcher3.Workspace>
- <include layout="@layout/gradient_bg" />
+ <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" />
<!-- DO NOT CHANGE THE ID -->
<include layout="@layout/hotseat"
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml
index 3f6be2c6a..8cf32bd0e 100644
--- a/res/layout/all_apps.xml
+++ b/res/layout/all_apps.xml
@@ -41,14 +41,6 @@
<include layout="@layout/predictions_view" android:id="@+id/header_content" />
- <include layout="@layout/all_apps_divider"
- android:id="@+id/divider"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginLeft="@dimen/all_apps_tabs_side_padding"
- android:layout_marginRight="@dimen/all_apps_tabs_side_padding"
- android:layout_alignBottom="@+id/tabs" />
-
<com.android.launcher3.allapps.PersonalWorkSlidingTabStrip
android:id="@+id/tabs"
android:layout_width="match_parent"
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 93c5114b7..1ae7cbfc3 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -50,6 +50,10 @@
<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>
+ <!-- Hotseat/all-apps scrim -->
+ <dimen name="all_apps_scrim_radius">10dp</dimen>
+ <dimen name="all_apps_scrim_margin">10dp</dimen>
+ <dimen name="all_apps_scrim_blur">5dp</dimen>
<!-- Drop target bar -->
<dimen name="dynamic_grid_drop_target_size">48dp</dimen>
@@ -97,6 +101,7 @@
<dimen name="all_apps_work_profile_tab_footer_top_padding">16dp</dimen>
<dimen name="all_apps_work_profile_tab_footer_bottom_padding">20dp</dimen>
<dimen name="all_apps_tabs_side_padding">12dp</dimen>
+ <dimen name="all_apps_divider_height">1dp</dimen>
<!-- Search bar in All Apps -->
<dimen name="all_apps_header_max_elevation">3dp</dimen>