summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorSunny Goyal <sunnygoyal@google.com>2018-05-04 13:19:29 -0700
committerSunny Goyal <sunnygoyal@google.com>2018-05-08 08:29:43 -0700
commit927447e71d5daef2bbd4ed313a41d3ef9759cb18 (patch)
tree4a2cac36db8c0d48ff2ae0e0229a8095fae39e34 /res/layout
parent729020d186406dffe3dc9300ee32a2ac974c4dff (diff)
downloadandroid_packages_apps_Trebuchet-927447e71d5daef2bbd4ed313a41d3ef9759cb18.tar.gz
android_packages_apps_Trebuchet-927447e71d5daef2bbd4ed313a41d3ef9759cb18.tar.bz2
android_packages_apps_Trebuchet-927447e71d5daef2bbd4ed313a41d3ef9759cb18.zip
Chaniging all-apps scrim
> Converting the scrim to View, to better avoid overdraw > Overview and Spring loaded state have different scrim alpha > When going from overview to all-apps, there is a color scrim drawn over the overview panel. The slef color is merged with this color to prevent overdraw, and the remaining screen is drawn with a cut-out round rect path Bug: 79111591 Change-Id: I26801fde13dd6adb4b06110bbe8087e35cc31847
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/launcher.xml3
-rw-r--r--res/layout/scrim_view.xml20
2 files changed, 23 insertions, 0 deletions
diff --git a/res/layout/launcher.xml b/res/layout/launcher.xml
index 6556adffc..cd8a4253b 100644
--- a/res/layout/launcher.xml
+++ b/res/layout/launcher.xml
@@ -57,6 +57,9 @@
android:id="@+id/drop_target_bar"
layout="@layout/drop_target_bar" />
+ <include android:id="@+id/scrim_view"
+ layout="@layout/scrim_view" />
+
<include
android:id="@+id/apps_view"
layout="@layout/all_apps"
diff --git a/res/layout/scrim_view.xml b/res/layout/scrim_view.xml
new file mode 100644
index 000000000..a604d569d
--- /dev/null
+++ b/res/layout/scrim_view.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2018 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.
+-->
+<com.android.launcher3.views.ScrimView
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:id="@+id/scrim_view" /> \ No newline at end of file