diff options
author | Mario Bertschler <bmario@google.com> | 2017-07-24 14:41:23 -0700 |
---|---|---|
committer | Mario Bertschler <bmario@google.com> | 2017-07-26 14:33:22 -0700 |
commit | 254bd42729e404d13a779b73b2f5dd67fa21e7da (patch) | |
tree | 728b77a741c98c1b0170d656c9ebe9c8a62b894d /res | |
parent | 8806475b8ee18b93ea832d1212daea6cdde8d0a5 (diff) | |
download | android_packages_apps_Trebuchet-254bd42729e404d13a779b73b2f5dd67fa21e7da.tar.gz android_packages_apps_Trebuchet-254bd42729e404d13a779b73b2f5dd67fa21e7da.tar.bz2 android_packages_apps_Trebuchet-254bd42729e404d13a779b73b2f5dd67fa21e7da.zip |
Merging ScrimView into GradientView
Less banding, less drawing for All Apps Transition.
Bug: 63873246
Change-Id: I6c7c856e2939a10db7e44b266c1d6d51334fd152
Diffstat (limited to 'res')
-rwxr-xr-x | res/drawable-hdpi/all_apps_alpha_mask.png | bin | 16035 -> 0 bytes | |||
-rwxr-xr-x | res/drawable-mdpi/all_apps_alpha_mask.png | bin | 15833 -> 0 bytes | |||
-rwxr-xr-x | res/drawable-xhdpi/all_apps_alpha_mask.png | bin | 16234 -> 0 bytes | |||
-rwxr-xr-x | res/drawable-xxhdpi/all_apps_alpha_mask.png | bin | 16658 -> 0 bytes | |||
-rwxr-xr-x | res/drawable-xxxhdpi/all_apps_alpha_mask.png | bin | 16512 -> 0 bytes | |||
-rw-r--r-- | res/layout-land/launcher.xml | 7 | ||||
-rw-r--r-- | res/layout-port/launcher.xml | 7 | ||||
-rw-r--r-- | res/layout-sw720dp/launcher.xml | 7 | ||||
-rw-r--r-- | res/layout/gradient_scrim.xml | 31 |
9 files changed, 18 insertions, 34 deletions
diff --git a/res/drawable-hdpi/all_apps_alpha_mask.png b/res/drawable-hdpi/all_apps_alpha_mask.png Binary files differdeleted file mode 100755 index 01e9e56f7..000000000 --- a/res/drawable-hdpi/all_apps_alpha_mask.png +++ /dev/null diff --git a/res/drawable-mdpi/all_apps_alpha_mask.png b/res/drawable-mdpi/all_apps_alpha_mask.png Binary files differdeleted file mode 100755 index f24e71d41..000000000 --- a/res/drawable-mdpi/all_apps_alpha_mask.png +++ /dev/null diff --git a/res/drawable-xhdpi/all_apps_alpha_mask.png b/res/drawable-xhdpi/all_apps_alpha_mask.png Binary files differdeleted file mode 100755 index f47943349..000000000 --- a/res/drawable-xhdpi/all_apps_alpha_mask.png +++ /dev/null diff --git a/res/drawable-xxhdpi/all_apps_alpha_mask.png b/res/drawable-xxhdpi/all_apps_alpha_mask.png Binary files differdeleted file mode 100755 index d5facd78c..000000000 --- a/res/drawable-xxhdpi/all_apps_alpha_mask.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/all_apps_alpha_mask.png b/res/drawable-xxxhdpi/all_apps_alpha_mask.png Binary files differdeleted file mode 100755 index ed53ff924..000000000 --- a/res/drawable-xxxhdpi/all_apps_alpha_mask.png +++ /dev/null diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml index fd66593cf..dab074391 100644 --- a/res/layout-land/launcher.xml +++ b/res/layout-land/launcher.xml @@ -42,7 +42,12 @@ android:layout_gravity="center" launcher:pageIndicator="@id/page_indicator" /> - <include layout="@layout/gradient_scrim" /> + <com.android.launcher3.graphics.GradientView + android:id="@+id/gradient_bg" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" + 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 93c90780b..bace51aac 100644 --- a/res/layout-port/launcher.xml +++ b/res/layout-port/launcher.xml @@ -44,7 +44,12 @@ launcher:pageIndicator="@+id/page_indicator"> </com.android.launcher3.Workspace> - <include layout="@layout/gradient_scrim" /> + <com.android.launcher3.graphics.GradientView + android:id="@+id/gradient_bg" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" + 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 ca4d846f1..18d235c1d 100644 --- a/res/layout-sw720dp/launcher.xml +++ b/res/layout-sw720dp/launcher.xml @@ -43,7 +43,12 @@ launcher:pageIndicator="@id/page_indicator"> </com.android.launcher3.Workspace> - <include layout="@layout/gradient_scrim" /> + <com.android.launcher3.graphics.GradientView + android:id="@+id/gradient_bg" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:visibility="gone" + launcher:layout_ignoreInsets="true"/> <!-- DO NOT CHANGE THE ID --> <include layout="@layout/hotseat" diff --git a/res/layout/gradient_scrim.xml b/res/layout/gradient_scrim.xml deleted file mode 100644 index c40c5fc0c..000000000 --- a/res/layout/gradient_scrim.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 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. ---> -<merge xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> - <com.android.launcher3.graphics.GradientView - android:id="@+id/gradient_bg" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" - app:layout_ignoreInsets="true"/> - - <com.android.launcher3.graphics.ScrimView - android:id="@+id/scrim_bg" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone" - app:layout_ignoreInsets="true"/> -</merge>
\ No newline at end of file |