summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2012-06-04 13:17:57 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-06-04 13:17:57 -0700
commita7d57335f2c66e170f949c2c4a6abac9ed2ae589 (patch)
treea37524ba72c623f50a84c4e69a8f7a40fa8c1f19
parentecd98e706c6d52dcc1c316b44b6b34bd71c1e2af (diff)
parentd4532bb728f12fed3633370d8c44959a035ed5b3 (diff)
downloadandroid_packages_apps_Trebuchet-a7d57335f2c66e170f949c2c4a6abac9ed2ae589.zip
android_packages_apps_Trebuchet-a7d57335f2c66e170f949c2c4a6abac9ed2ae589.tar.gz
android_packages_apps_Trebuchet-a7d57335f2c66e170f949c2c4a6abac9ed2ae589.tar.bz2
am d4532bb7: Merge "Fixing issue where widgets could be inflated in wrong orientation (issue 6584646)" into jb-dev
* commit 'd4532bb728f12fed3633370d8c44959a035ed5b3': Fixing issue where widgets could be inflated in wrong orientation (issue 6584646)
-rw-r--r--src/com/android/launcher2/Launcher.java25
-rw-r--r--src/com/android/launcher2/LauncherAppWidgetHostView.java22
-rw-r--r--src/com/android/launcher2/LauncherModel.java4
3 files changed, 51 insertions, 0 deletions
diff --git a/src/com/android/launcher2/Launcher.java b/src/com/android/launcher2/Launcher.java
index b2f27b9..3354d49 100644
--- a/src/com/android/launcher2/Launcher.java
+++ b/src/com/android/launcher2/Launcher.java
@@ -682,6 +682,31 @@ public final class Launcher extends Activity
// Resets the previous all apps icon press state
mAppsCustomizeContent.resetDrawableState();
}
+ // It is possible that widgets can receive updates while launcher is not in the foreground.
+ // Consequently, the widgets will be inflated in the orientation of the foreground activity
+ // (framework issue). On resuming, we ensure that any widgets are inflated for the current
+ // orientation.
+ reinflateWidgetsIfNecessary();
+ }
+
+ void reinflateWidgetsIfNecessary() {
+ for (LauncherAppWidgetInfo info: LauncherModel.getWidgets()) {
+ LauncherAppWidgetHostView lahv = (LauncherAppWidgetHostView) info.hostView;
+ if (lahv != null && lahv.orientationChangedSincedInflation()) {
+ AppWidgetProviderInfo pInfo = lahv.getAppWidgetInfo();
+
+ // Remove the current widget which is inflated with the wrong orientation
+ getWorkspace().getParentCellLayoutForView(lahv).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);
+ }
+ }
}
@Override
diff --git a/src/com/android/launcher2/LauncherAppWidgetHostView.java b/src/com/android/launcher2/LauncherAppWidgetHostView.java
index e34196e..9970c76 100644
--- a/src/com/android/launcher2/LauncherAppWidgetHostView.java
+++ b/src/com/android/launcher2/LauncherAppWidgetHostView.java
@@ -18,10 +18,14 @@ package com.android.launcher2;
import android.appwidget.AppWidgetHostView;
import android.content.Context;
+import android.content.res.Configuration;
+import android.os.Bundle;
+import android.os.Parcel;
import android.view.LayoutInflater;
import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
+import android.widget.RemoteViews;
import com.android.launcher.R;
@@ -31,9 +35,12 @@ import com.android.launcher.R;
public class LauncherAppWidgetHostView extends AppWidgetHostView {
private CheckLongPressHelper mLongPressHelper;
private LayoutInflater mInflater;
+ private Context mContext;
+ private int mPreviousOrientation;
public LauncherAppWidgetHostView(Context context) {
super(context);
+ mContext = context;
mLongPressHelper = new CheckLongPressHelper(this);
mInflater = (LayoutInflater) context.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
}
@@ -43,6 +50,21 @@ public class LauncherAppWidgetHostView extends AppWidgetHostView {
return mInflater.inflate(R.layout.appwidget_error, this, false);
}
+ @Override
+ public void updateAppWidget(RemoteViews remoteViews) {
+ // Store the orientation in which the widget was inflated
+ mPreviousOrientation = mContext.getResources().getConfiguration().orientation;
+ super.updateAppWidget(remoteViews);
+ }
+
+ public boolean orientationChangedSincedInflation() {
+ int orientation = mContext.getResources().getConfiguration().orientation;
+ if (mPreviousOrientation != orientation) {
+ return true;
+ }
+ return false;
+ }
+
public boolean onInterceptTouchEvent(MotionEvent ev) {
// Consume any touch events for ourselves after longpress is triggered
if (mLongPressHelper.hasPerformedLongPress()) {
diff --git a/src/com/android/launcher2/LauncherModel.java b/src/com/android/launcher2/LauncherModel.java
index fc1a26d..1b17ef9 100644
--- a/src/com/android/launcher2/LauncherModel.java
+++ b/src/com/android/launcher2/LauncherModel.java
@@ -377,6 +377,10 @@ public class LauncherModel extends BroadcastReceiver {
return items;
}
+ static ArrayList<LauncherAppWidgetInfo> getWidgets() {
+ return sAppWidgets;
+ }
+
/**
* Find a folder in the db, creating the FolderInfo if necessary, and adding it to folderList.
*/