diff options
author | Jon Miranda <jonmiranda@google.com> | 2018-01-18 11:35:10 -0800 |
---|---|---|
committer | Jon Miranda <jonmiranda@google.com> | 2018-01-18 14:15:45 -0800 |
commit | de43a71b06cd1b5dd5fa38eb1e90c4b26bd99e53 (patch) | |
tree | 9c18216e41d268c4b74236870cee753d874ba413 /src/com | |
parent | 69057173a732add164f83ddc926009c0cdca5e7c (diff) | |
download | android_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 'src/com')
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 6 | ||||
-rw-r--r-- | src/com/android/launcher3/LauncherRootView.java | 9 | ||||
-rw-r--r-- | src/com/android/launcher3/dragndrop/DragLayer.java | 7 |
3 files changed, 12 insertions, 10 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index bfd3d69f0..cf7486623 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -769,12 +769,12 @@ public class Launcher extends BaseActivity mAppWidgetHost.setListenIfResumed(true); NotificationListener.setNotificationsChangedListener(mPopupDataProvider); - if (mShouldFadeInScrim && mDragLayer.getBackground() != null) { + if (mShouldFadeInScrim && mLauncherView.getBackground() != null) { if (mScrimAnimator != null) { mScrimAnimator.cancel(); } - mDragLayer.getBackground().setAlpha(0); - mScrimAnimator = ObjectAnimator.ofInt(mDragLayer.getBackground(), + mLauncherView.getBackground().setAlpha(0); + mScrimAnimator = ObjectAnimator.ofInt(mLauncherView.getBackground(), LauncherAnimUtils.DRAWABLE_ALPHA, 0, 255); mScrimAnimator.addListener(new AnimatorListenerAdapter() { @Override diff --git a/src/com/android/launcher3/LauncherRootView.java b/src/com/android/launcher3/LauncherRootView.java index 1a1bec684..c2c8a7c96 100644 --- a/src/com/android/launcher3/LauncherRootView.java +++ b/src/com/android/launcher3/LauncherRootView.java @@ -11,6 +11,8 @@ import android.util.AttributeSet; import android.view.View; import android.view.ViewDebug; +import com.android.launcher3.util.Themes; + import static com.android.launcher3.util.SystemUiController.FLAG_DARK_NAV; import static com.android.launcher3.util.SystemUiController.UI_STATE_ROOT_VIEW; @@ -81,6 +83,13 @@ public class LauncherRootView extends InsettableFrameLayout { return true; // I'll take it from here } + @Override + public void setInsets(Rect insets) { + super.setInsets(insets); + setBackground(insets.top == 0 ? null + : Themes.getAttrDrawable(getContext(), R.attr.workspaceStatusBarScrim)); + } + public void dispatchInsets() { fitSystemWindows(mInsets); } diff --git a/src/com/android/launcher3/dragndrop/DragLayer.java b/src/com/android/launcher3/dragndrop/DragLayer.java index c75e61632..93a56791e 100644 --- a/src/com/android/launcher3/dragndrop/DragLayer.java +++ b/src/com/android/launcher3/dragndrop/DragLayer.java @@ -366,13 +366,6 @@ public class DragLayer extends InsettableFrameLayout { } @Override - public void setInsets(Rect insets) { - super.setInsets(insets); - setBackground(insets.top == 0 ? null - : Themes.getAttrDrawable(getContext(), R.attr.workspaceStatusBarScrim)); - } - - @Override public LayoutParams generateLayoutParams(AttributeSet attrs) { return new LayoutParams(getContext(), attrs); } |