diff options
| author | Adam Cohen <adamcohen@google.com> | 2014-09-09 15:07:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-09 15:07:53 +0000 |
| commit | b6711ac01cfc7ac507e6c01c0aba4670178a5cab (patch) | |
| tree | dfaefe5b42820567e63ac9ef7ebc52614e00ae18 | |
| parent | 7c938d99a5e6a474bf40ef310d94c9582bc91787 (diff) | |
| parent | 0f668f3c2be93ad9be221d868abb3d9a6e418f18 (diff) | |
| download | android_packages_apps_Trebuchet-b6711ac01cfc7ac507e6c01c0aba4670178a5cab.tar.gz android_packages_apps_Trebuchet-b6711ac01cfc7ac507e6c01c0aba4670178a5cab.tar.bz2 android_packages_apps_Trebuchet-b6711ac01cfc7ac507e6c01c0aba4670178a5cab.zip | |
am 0f668f3c: Prevent GNL from crashing on JB
* commit '0f668f3c2be93ad9be221d868abb3d9a6e418f18':
Prevent GNL from crashing on JB
| -rw-r--r-- | src/com/android/launcher3/AppsCustomizePagedView.java | 6 | ||||
| -rw-r--r-- | src/com/android/launcher3/Launcher.java | 17 |
2 files changed, 20 insertions, 3 deletions
diff --git a/src/com/android/launcher3/AppsCustomizePagedView.java b/src/com/android/launcher3/AppsCustomizePagedView.java index a92bff1b6..1bd290777 100644 --- a/src/com/android/launcher3/AppsCustomizePagedView.java +++ b/src/com/android/launcher3/AppsCustomizePagedView.java @@ -366,7 +366,11 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen // This code triggers requestLayout so must be posted outside of the // layout pass. public void run() { - if (isAttachedToWindow()) { + boolean attached = true; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + attached = isAttachedToWindow(); + } + if (attached) { setDataIsReady(); onDataReady(getMeasuredWidth(), getMeasuredHeight()); } diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 33cc29e67..5c6261dc5 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -59,6 +59,7 @@ import android.graphics.Rect; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.os.Environment; import android.os.Handler; @@ -3378,7 +3379,13 @@ public class Launcher extends Activity if (Utilities.isLmp()) { for (int i = 0; i < layerViews.size(); i++) { View v = layerViews.get(i); - if (v != null && v.isAttachedToWindow()) v.buildLayer(); + if (v != null) { + boolean attached = true; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + attached = v.isAttachedToWindow(); + } + if (attached) v.buildLayer(); + } } } mStateAnimation.start(); @@ -3625,7 +3632,13 @@ public class Launcher extends Activity if (Utilities.isLmp()) { for (int i = 0; i < layerViews.size(); i++) { View v = layerViews.get(i); - if (v != null && v.isAttachedToWindow()) v.buildLayer(); + if (v != null) { + boolean attached = true; + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + attached = v.isAttachedToWindow(); + } + if (attached) v.buildLayer(); + } } } mStateAnimation.start(); |