openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

am 0f668f3c: Prevent GNL from crashing on JB 

* commit '0f668f3c2be93ad9be221d868abb3d9a6e418f18':
  Prevent GNL from crashing on JB
This commit is contained in:
Adam Cohen 2014-09-09 15:07:53 +00:00 committed by Android Git Automerger
parent 7c938d99a5 0f668f3c2b
commit b6711ac01c
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/launcher3/AppsCustomizePagedView.java
View File

@ -366,7 +366,11 @@ public class AppsCustomizePagedView extends PagedViewWithDraggableItems implemen
// This code triggers requestLayout so must be posted outside of the // This code triggers requestLayout so must be posted outside of the
// layout pass. // layout pass.
public void run() { public void run() {
if (isAttachedToWindow()) { boolean attached = true;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
attached = isAttachedToWindow();
}
if (attached) {
setDataIsReady(); setDataIsReady();
onDataReady(getMeasuredWidth(), getMeasuredHeight()); onDataReady(getMeasuredWidth(), getMeasuredHeight());
} }

17
src/com/android/launcher3/Launcher.java
View File

@ -59,6 +59,7 @@ import android.graphics.Rect;
import android.graphics.drawable.Drawable; import android.graphics.drawable.Drawable;
import android.net.Uri; import android.net.Uri;
import android.os.AsyncTask; import android.os.AsyncTask;
import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Environment; import android.os.Environment;
import android.os.Handler; import android.os.Handler;
@ -3378,7 +3379,13 @@ public class Launcher extends Activity
if (Utilities.isLmp()) { if (Utilities.isLmp()) {
for (int i = 0; i < layerViews.size(); i++) { for (int i = 0; i < layerViews.size(); i++) {
View v = layerViews.get(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(); mStateAnimation.start();
@ -3625,7 +3632,13 @@ public class Launcher extends Activity
if (Utilities.isLmp()) { if (Utilities.isLmp()) {
for (int i = 0; i < layerViews.size(); i++) { for (int i = 0; i < layerViews.size(); i++) {
View v = layerViews.get(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(); mStateAnimation.start();