summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2016-08-19 10:50:12 -0700
committerSunny Goyal <sunnygoyal@google.com>2016-08-23 19:04:23 -0700
commit65ceb5aa55403482e92e1e86105c1ef5510688ad (patch)
tree1493865c1c7276b3908a4af94a19451014b7b23b /res
parent8f90dcff37f13bbbc3f875f1c9521cbc9745c673 (diff)
downloadandroid_packages_apps_Trebuchet-65ceb5aa55403482e92e1e86105c1ef5510688ad.tar.gz
android_packages_apps_Trebuchet-65ceb5aa55403482e92e1e86105c1ef5510688ad.tar.bz2
android_packages_apps_Trebuchet-65ceb5aa55403482e92e1e86105c1ef5510688ad.zip
Moving the scrim to draglayer
> This causes the scrim to animate with the content on first launch > Also removing the logic to disable scrim based on state. That logic was only executing onResume which could lead to an invalid state Bug: 30972956 Bug: 30576826 Change-Id: Ia8386b303ce260f69e3b3b93041226f409301a01
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/launcher.xml1
-rw-r--r--res/layout-port/launcher.xml1
-rw-r--r--res/layout-sw720dp/launcher.xml1
3 files changed, 3 insertions, 0 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 2e64f6c3f..ef0dfdcc6 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -27,6 +27,7 @@
android:id="@+id/drag_layer"
android:clipChildren="false"
android:clipToPadding="false"
+ android:background="@drawable/workspace_bg"
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 d6e2802e2..49bac3bcc 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -29,6 +29,7 @@
android:clipChildren="false"
android:importantForAccessibility="no"
android:clipToPadding="false"
+ android:background="@drawable/workspace_bg"
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 3a429c637..81d2e1b8f 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -28,6 +28,7 @@
android:clipChildren="false"
android:clipToPadding="false"
android:importantForAccessibility="no"
+ android:background="@drawable/workspace_bg"
android:layout_width="match_parent"
android:layout_height="match_parent">