diff options
| author | Winson Chung <winsonc@google.com> | 2015-05-12 18:55:26 -0700 |
|---|---|---|
| committer | Winson Chung <winsonc@google.com> | 2015-05-13 02:01:21 +0000 |
| commit | 11509ad61afb7424ce83057b0d2a4b09f853651f (patch) | |
| tree | 6491bc99478ebecd6ede5ae5b3126b6ecb7587f9 /src/com/android/launcher3/LauncherStateTransitionAnimation.java | |
| parent | ed0c1cc739d3b3d82c301299db8abc3146de49bb (diff) | |
| download | android_packages_apps_Trebuchet-11509ad61afb7424ce83057b0d2a4b09f853651f.tar.gz android_packages_apps_Trebuchet-11509ad61afb7424ce83057b0d2a4b09f853651f.tar.bz2 android_packages_apps_Trebuchet-11509ad61afb7424ce83057b0d2a4b09f853651f.zip | |
Fixing regression from g/649060 regarding building layers for detached views.
Bug: 21063014
Change-Id: Iff0dba8be5fe7ef5dce4fc65fb6391c33c50b253
Diffstat (limited to 'src/com/android/launcher3/LauncherStateTransitionAnimation.java')
| -rw-r--r-- | src/com/android/launcher3/LauncherStateTransitionAnimation.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/com/android/launcher3/LauncherStateTransitionAnimation.java b/src/com/android/launcher3/LauncherStateTransitionAnimation.java index 51f84bfcd..73ae51c3e 100644 --- a/src/com/android/launcher3/LauncherStateTransitionAnimation.java +++ b/src/com/android/launcher3/LauncherStateTransitionAnimation.java @@ -378,11 +378,12 @@ public class LauncherStateTransitionAnimation { dispatchOnLauncherTransitionStart(toView, animated, false); // Enable all necessary layers + boolean isLmpOrAbove = Utilities.isLmpOrAbove(); for (View v : layerViews.keySet()) { if (layerViews.get(v) == BUILD_AND_SET_LAYER) { v.setLayerType(View.LAYER_TYPE_HARDWARE, null); } - if (Utilities.isViewAttachedToWindow(v)) { + if (isLmpOrAbove && Utilities.isViewAttachedToWindow(v)) { v.buildLayer(); } } @@ -697,11 +698,12 @@ public class LauncherStateTransitionAnimation { dispatchOnLauncherTransitionStart(toView, animated, false); // Enable all necessary layers + boolean isLmpOrAbove = Utilities.isLmpOrAbove(); for (View v : layerViews.keySet()) { if (layerViews.get(v) == BUILD_AND_SET_LAYER) { v.setLayerType(View.LAYER_TYPE_HARDWARE, null); } - if (Utilities.isLmpOrAbove()) { + if (isLmpOrAbove && Utilities.isViewAttachedToWindow(v)) { v.buildLayer(); } } |