summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorJon Miranda <jonmiranda@google.com>2018-01-18 11:35:10 -0800
committerJon Miranda <jonmiranda@google.com>2018-01-18 14:15:45 -0800
commitde43a71b06cd1b5dd5fa38eb1e90c4b26bd99e53 (patch)
tree9c18216e41d268c4b74236870cee753d874ba413 /res
parent69057173a732add164f83ddc926009c0cdca5e7c (diff)
downloadandroid_packages_apps_Trebuchet-de43a71b06cd1b5dd5fa38eb1e90c4b26bd99e53.tar.gz
android_packages_apps_Trebuchet-de43a71b06cd1b5dd5fa38eb1e90c4b26bd99e53.tar.bz2
android_packages_apps_Trebuchet-de43a71b06cd1b5dd5fa38eb1e90c4b26bd99e53.zip
Move scrim from DragLayer to LauncherRootView.
This change will make opening/closing animations a lot cleaner. Change-Id: I7f8ae301a9a126023833e282d6654bebd09bb306
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/launcher.xml2
-rw-r--r--res/layout-port/launcher.xml2
-rw-r--r--res/layout-sw720dp/launcher.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 9bd3c672b..f26bfbd0d 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -21,13 +21,13 @@
android:id="@+id/launcher"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="?attr/workspaceStatusBarScrim"
android:fitsSystemWindows="true">
<com.android.launcher3.dragndrop.DragLayer
android:id="@+id/drag_layer"
android:clipChildren="false"
android:clipToPadding="false"
- android:background="?attr/workspaceStatusBarScrim"
android:importantForAccessibility="no"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index b678398f9..cde3bd559 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -22,6 +22,7 @@
android:id="@+id/launcher"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="?attr/workspaceStatusBarScrim"
android:fitsSystemWindows="true">
<com.android.launcher3.dragndrop.DragLayer
@@ -29,7 +30,6 @@
android:clipChildren="false"
android:importantForAccessibility="no"
android:clipToPadding="false"
- android:background="?attr/workspaceStatusBarScrim"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index 7e6c659ad..fe2f10846 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -21,6 +21,7 @@
android:id="@+id/launcher"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:background="?attr/workspaceStatusBarScrim"
android:fitsSystemWindows="true">
<com.android.launcher3.dragndrop.DragLayer
@@ -28,7 +29,6 @@
android:clipChildren="false"
android:clipToPadding="false"
android:importantForAccessibility="no"
- android:background="?attr/workspaceStatusBarScrim"
android:layout_width="match_parent"
android:layout_height="match_parent">