diff options
| author | Sunny Goyal <sunnygoyal@google.com> | 2016-11-07 18:09:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-11-07 18:09:43 +0000 |
| commit | c48a89e59cc1b874b86590b180ef3fd96d26eac2 (patch) | |
| tree | cf895246f2adc2608b287fe9a159fa7b648d5105 /src/com/android/launcher3/Launcher.java | |
| parent | 47564ca3a1c8903e757cec57b269c5553b2b3c41 (diff) | |
| parent | b5e65c8bd3785409d4aeda21f2c88e75c9e22c9f (diff) | |
| download | android_packages_apps_Trebuchet-c48a89e59cc1b874b86590b180ef3fd96d26eac2.tar.gz android_packages_apps_Trebuchet-c48a89e59cc1b874b86590b180ef3fd96d26eac2.tar.bz2 android_packages_apps_Trebuchet-c48a89e59cc1b874b86590b180ef3fd96d26eac2.zip | |
Merge "Calling buildLayer only on views which are actually visible" into ub-launcher3-master
Diffstat (limited to 'src/com/android/launcher3/Launcher.java')
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index f372d9518..9a42513b4 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -86,6 +86,7 @@ import com.android.launcher3.accessibility.LauncherAccessibilityDelegate; import com.android.launcher3.allapps.AllAppsContainerView; import com.android.launcher3.allapps.AllAppsTransitionController; import com.android.launcher3.allapps.DefaultAppSearchController; +import com.android.launcher3.anim.AnimationLayerSet; import com.android.launcher3.compat.AppWidgetManagerCompat; import com.android.launcher3.compat.LauncherActivityInfoCompat; import com.android.launcher3.compat.LauncherAppsCompat; @@ -2970,7 +2971,7 @@ public class Launcher extends Activity * new state. */ public Animator startWorkspaceStateChangeAnimation(Workspace.State toState, - boolean animated, HashMap<View, Integer> layerViews) { + boolean animated, AnimationLayerSet layerViews) { Workspace.State fromState = mWorkspace.getState(); Animator anim = mWorkspace.setStateWithAnimation(toState, animated, layerViews); updateInteraction(fromState, toState); |