PawletOS/Lawnchair
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 11509ad6: Fixing regression from g/649060 regarding building layers for detached views.

Browse Source 
* commit '11509ad61afb7424ce83057b0d2a4b09f853651f':
  Fixing regression from g/649060 regarding building layers for detached views.
This commit is contained in:
Winson Chung
2015-05-13 02:10:31 +00:00
committed by Android Git Automerger
parent 1ac119a8eb 11509ad61a
commit 0b907de367
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/LauncherStateTransitionAnimation.java
+4 -2
View File
@@ -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();
}
}