diff options
author | Adam Cohen <adamcohen@google.com> | 2012-06-05 16:03:36 -0700 |
---|---|---|
committer | The Android Automerger <android-build@android.com> | 2012-06-05 16:24:49 -0700 |
commit | e6a43a2e267e763d829fd5a1bfd708df0836e30d (patch) | |
tree | 1674e9823294544ef3f28090b3585ec602e0a9d0 | |
parent | a58cc94bee8fc8c8a0c8673b8ad27fa339a8e83c (diff) | |
download | android_packages_apps_Trebuchet-e6a43a2e267e763d829fd5a1bfd708df0836e30d.tar.gz android_packages_apps_Trebuchet-e6a43a2e267e763d829fd5a1bfd708df0836e30d.tar.bz2 android_packages_apps_Trebuchet-e6a43a2e267e763d829fd5a1bfd708df0836e30d.zip |
Fix workaround for crashing on rotation. (Bug 6611883)
Change-Id: Iaf9734d156e5aa48f3630f22a42e17d71af37316
-rw-r--r-- | src/com/android/launcher2/Launcher.java | 29 |
1 files changed, 18 insertions, 11 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java index 105d9436b..fb29a4131 100644 --- a/src/com/android/launcher2/Launcher.java +++ b/src/com/android/launcher2/Launcher.java @@ -703,17 +703,24 @@ public final class Launcher extends Activity if (lahv != null && lahv.orientationChangedSincedInflation()) { AppWidgetProviderInfo pInfo = lahv.getAppWidgetInfo(); - // Remove the current widget which is inflated with the wrong orientation - CellLayout cl = getWorkspace().getParentCellLayoutForView(lahv); - if (cl != null) cl.removeView(lahv); - // Re-inflate the widget using the correct orientation - AppWidgetHostView widget = mAppWidgetHost.createView(this, info.appWidgetId, pInfo); - - // Add the new widget back - widget.setTag(info); - info.hostView = widget; - getWorkspace().addInScreen(widget, info.container, info.screen, - info.cellX, info.cellY, info.spanX, info.spanY); + Workspace workspace = getWorkspace(); + CellLayout parent = workspace.getParentCellLayoutForView(lahv); + + // It's possible this AppWidgetHostView is associated with a prior Launcher instance + // in which case it will not have a parent in the current hierarchy (ie. after rotation). + // In this case we will be re-inflating the widgets anyhow, so it's not a problem. + if (parent != null) { + // Remove the current widget which is inflated with the wrong orientation + parent.removeView(lahv); + // Re-inflate the widget using the correct orientation + AppWidgetHostView widget = mAppWidgetHost.createView(this, info.appWidgetId, pInfo); + + // Add the new widget back + widget.setTag(info); + info.hostView = widget; + getWorkspace().addInScreen(widget, info.container, info.screen, + info.cellX, info.cellY, info.spanX, info.spanY); + } } } } |