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

am 5637b87d: Fix workaround for crashing on rotation. (Bug 6611883)

Browse Source 
* commit '5637b87d8b71f2af1794abcd980d9d7ffacb7333':
  Fix workaround for crashing on rotation. (Bug 6611883)
This commit is contained in:
Adam Cohen
2012-06-05 16:12:40 -07:00
committed by Android Git Automerger
parent 3e95341fec 5637b87d8b
commit ff4714f326
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher2/Launcher.java
+17 -10
View File
@@ -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);
Workspace workspace = getWorkspace();
CellLayout parent = workspace.getParentCellLayoutForView(lahv);
// 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);
// 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);
}
}
}
}