diff options
author | Sunny Goyal <sunnygoyal@google.com> | 2018-05-04 13:19:29 -0700 |
---|---|---|
committer | Sunny Goyal <sunnygoyal@google.com> | 2018-05-08 08:29:43 -0700 |
commit | 927447e71d5daef2bbd4ed313a41d3ef9759cb18 (patch) | |
tree | 4a2cac36db8c0d48ff2ae0e0229a8095fae39e34 /src_ui_overrides | |
parent | 729020d186406dffe3dc9300ee32a2ac974c4dff (diff) | |
download | packages_apps_Trebuchet-927447e71d5daef2bbd4ed313a41d3ef9759cb18.tar.gz packages_apps_Trebuchet-927447e71d5daef2bbd4ed313a41d3ef9759cb18.tar.bz2 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 'src_ui_overrides')
-rw-r--r-- | src_ui_overrides/com/android/launcher3/uioverrides/AllAppsScrim.java | 39 | ||||
-rw-r--r-- | src_ui_overrides/com/android/launcher3/uioverrides/AllAppsState.java | 2 |
2 files changed, 1 insertions, 40 deletions
diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/AllAppsScrim.java b/src_ui_overrides/com/android/launcher3/uioverrides/AllAppsScrim.java deleted file mode 100644 index e970c5beb..000000000 --- a/src_ui_overrides/com/android/launcher3/uioverrides/AllAppsScrim.java +++ /dev/null @@ -1,39 +0,0 @@ -/* - * 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. - */ - -package com.android.launcher3.uioverrides; - -import static com.android.launcher3.anim.Interpolators.ACCEL_1_5; - -import com.android.launcher3.R; -import com.android.launcher3.allapps.AllAppsContainerView; -import com.android.launcher3.graphics.ColorScrim; -import com.android.launcher3.util.Themes; - -public class AllAppsScrim extends ColorScrim { - - public AllAppsScrim(AllAppsContainerView view) { - super(view, Themes.getAttrColor(view.getContext(), R.attr.allAppsScrimColor), ACCEL_1_5); - } - - public void reInitUi() { - // No op - } - - public void onVerticalProgress(float progress) { - // No op - } -} diff --git a/src_ui_overrides/com/android/launcher3/uioverrides/AllAppsState.java b/src_ui_overrides/com/android/launcher3/uioverrides/AllAppsState.java index 6366b2d8f..4a2f544e8 100644 --- a/src_ui_overrides/com/android/launcher3/uioverrides/AllAppsState.java +++ b/src_ui_overrides/com/android/launcher3/uioverrides/AllAppsState.java @@ -34,7 +34,7 @@ public class AllAppsState extends LauncherState { private static final float PARALLAX_COEFFICIENT = .125f; - private static final int STATE_FLAGS = FLAG_DISABLE_ACCESSIBILITY | FLAG_ALL_APPS_SCRIM; + private static final int STATE_FLAGS = FLAG_DISABLE_ACCESSIBILITY; private static final PageAlphaProvider PAGE_ALPHA_PROVIDER = new PageAlphaProvider(DEACCEL_2) { @Override |