diff options
| author | Mario Bertschler <bmario@google.com> | 2017-07-26 21:39:28 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-07-26 21:39:28 +0000 |
| commit | 9fac09d85267f631702e239de3576f24c31e120c (patch) | |
| tree | 805cf5c40197fc7844bf22225f4401558e3f40aa /src/com/android/launcher3/allapps | |
| parent | 6072ad04129ba0163c441c2f00e7d5a98e1ec30c (diff) | |
| parent | a0465afe8de773acd371c8ebb91e92735191631d (diff) | |
| download | android_packages_apps_Trebuchet-9fac09d85267f631702e239de3576f24c31e120c.tar.gz android_packages_apps_Trebuchet-9fac09d85267f631702e239de3576f24c31e120c.tar.bz2 android_packages_apps_Trebuchet-9fac09d85267f631702e239de3576f24c31e120c.zip | |
Merge "Merging ScrimView into GradientView" into ub-launcher3-dorval-polish2
Diffstat (limited to 'src/com/android/launcher3/allapps')
| -rw-r--r-- | src/com/android/launcher3/allapps/AllAppsTransitionController.java | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/src/com/android/launcher3/allapps/AllAppsTransitionController.java b/src/com/android/launcher3/allapps/AllAppsTransitionController.java index a6194cc20..6896b37d9 100644 --- a/src/com/android/launcher3/allapps/AllAppsTransitionController.java +++ b/src/com/android/launcher3/allapps/AllAppsTransitionController.java @@ -25,7 +25,6 @@ import com.android.launcher3.Workspace; import com.android.launcher3.anim.SpringAnimationHandler; import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.graphics.GradientView; -import com.android.launcher3.graphics.ScrimView; import com.android.launcher3.touch.SwipeDetector; import com.android.launcher3.userevent.nano.LauncherLogProto.Action; import com.android.launcher3.userevent.nano.LauncherLogProto.ContainerType; @@ -101,7 +100,6 @@ public class AllAppsTransitionController implements TouchController, SwipeDetect private boolean mIsTranslateWithoutWorkspace = false; private AnimatorSet mDiscoBounceAnimation; private GradientView mGradientView; - private ScrimView mScrimView; private SpringAnimationHandler mSpringAnimationHandler; @@ -302,13 +300,6 @@ public class AllAppsTransitionController implements TouchController, SwipeDetect mGradientView.setVisibility(View.VISIBLE); } mGradientView.setProgress(progress); - - // scrim - if (mScrimView == null) { - mScrimView = (ScrimView) mLauncher.findViewById(R.id.scrim_bg); - mScrimView.setVisibility(View.VISIBLE); - } - mScrimView.setProgress(progress); } /** |