diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-12-14 20:27:44 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-12-14 20:27:44 +0000 |
| commit | d56d7b97000fe24ad072331c0f9741327923bb8e (patch) | |
| tree | 4302bb7146ce67ecfd327e207293b64e775fc82a /res | |
| parent | 86cc383d6b3b8e71f04c66a40783f82b1d12e57e (diff) | |
| parent | b532dfe45df5cf254e4ea6ab7c7e01051834ad65 (diff) | |
| download | android_packages_apps_Trebuchet-d56d7b97000fe24ad072331c0f9741327923bb8e.tar.gz android_packages_apps_Trebuchet-d56d7b97000fe24ad072331c0f9741327923bb8e.tar.bz2 android_packages_apps_Trebuchet-d56d7b97000fe24ad072331c0f9741327923bb8e.zip | |
Merge "Updating the hotseat background to a solid color with rounded corners" into ub-launcher3-master
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-land/launcher.xml | 6 | ||||
| -rw-r--r-- | res/layout-port/launcher.xml | 6 | ||||
| -rw-r--r-- | res/layout-sw720dp/launcher.xml | 6 | ||||
| -rw-r--r-- | res/values/dimens.xml | 4 |
4 files changed, 19 insertions, 3 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/values/dimens.xml b/res/values/dimens.xml index c77a0387a..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> |