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

Don't clobber widgets with the same component - DO NOT MERGE

Browse Source 
By not storing them in a HashMap keyed against ComponentName (which is
almost guaranteed to conflict with other widgets when managed profiles
are in play).

Bug: 19444068
Change-Id: I6ffce78e8aaf265196239670404cbdaff9fa09be
This commit is contained in:
Robin Lee
2015-03-16 19:41:43 +00:00
parent ef30a2a831
commit 2dd9f018ff
5 changed files with 87 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/com/android/launcher3/Launcher.java
+1 -1
View File
@@ -4371,7 +4371,7 @@ public class Launcher extends Activity
final Workspace workspace = mWorkspace;
LauncherAppWidgetProviderInfo appWidgetInfo =
LauncherModel.getProviderInfo(this, item.providerName);
LauncherModel.getProviderInfo(this, item.providerName, item.user);
if (!mIsSafeModeEnabled
&& ((item.restoreStatus & LauncherAppWidgetInfo.FLAG_PROVIDER_NOT_READY) == 0)
src/com/android/launcher3/LauncherBackupHelper.java
+6 -3
View File
@@ -650,7 +650,10 @@ public class LauncherBackupHelper implements BackupHelper {
if (DEBUG) Log.d(TAG, "saving widget " + backupKey);
previewLoader.setPreviewSize(spanX * profile.cellWidthPx,
spanY * profile.cellHeightPx, widgetSpacingLayout);
writeRowToBackup(key, packWidget(dpi, previewLoader, mIconCache, provider), data);
UserHandleCompat user = UserHandleCompat.myUserHandle();
writeRowToBackup(key,
packWidget(dpi, previewLoader, mIconCache, provider, user),
data);
mKeys.add(key);
backupWidgetCount ++;
} else {
@@ -913,9 +916,9 @@ public class LauncherBackupHelper implements BackupHelper {
/** Serialize a widget for persistence, including a checksum wrapper. */
private Widget packWidget(int dpi, WidgetPreviewLoader previewLoader, IconCache iconCache,
ComponentName provider) {
ComponentName provider, UserHandleCompat user) {
final LauncherAppWidgetProviderInfo info =
LauncherModel.getProviderInfo(mContext, provider);
LauncherModel.getProviderInfo(mContext, provider, user);
Widget widget = new Widget();
widget.provider = provider.flattenToShortString();
widget.label = info.label;
src/com/android/launcher3/LauncherModel.java
+27 -20
View File
@@ -59,6 +59,7 @@ import com.android.launcher3.compat.PackageInstallerCompat;
import com.android.launcher3.compat.PackageInstallerCompat.PackageInstallInfo;
import com.android.launcher3.compat.UserHandleCompat;
import com.android.launcher3.compat.UserManagerCompat;
import com.android.launcher3.util.ComponentKey;
import java.lang.ref.WeakReference;
import java.net.URISyntaxException;
@@ -174,7 +175,7 @@ public class LauncherModel extends BroadcastReceiver
static final ArrayList<Long> sBgWorkspaceScreens = new ArrayList<Long>();
// sBgWidgetProviders is the set of widget providers including custom internal widgets
public static HashMap<ComponentName, LauncherAppWidgetProviderInfo> sBgWidgetProviders;
public static HashMap<ComponentKey, LauncherAppWidgetProviderInfo> sBgWidgetProviders;
// sPendingPackages is a set of packages which could be on sdcard and are not available yet
static final HashMap<UserHandleCompat, HashSet<String>> sPendingPackages =
@@ -1958,6 +1959,7 @@ public class LauncherModel extends BroadcastReceiver
LauncherAppWidgetInfo appWidgetInfo;
int container;
long id;
long serialNumber;
Intent intent;
UserHandleCompat user;
@@ -1972,7 +1974,7 @@ public class LauncherModel extends BroadcastReceiver
case LauncherSettings.Favorites.ITEM_TYPE_SHORTCUT:
id = c.getLong(idIndex);
intentDescription = c.getString(intentIndex);
long serialNumber = c.getInt(profileIdIndex);
serialNumber = c.getInt(profileIdIndex);
user = mUserManager.getUserForSerialNumber(serialNumber);
int promiseType = c.getInt(restoredIndex);
int disabledState = 0;
@@ -2210,6 +2212,7 @@ public class LauncherModel extends BroadcastReceiver
LauncherSettings.Favorites.ITEM_TYPE_CUSTOM_APPWIDGET;
int appWidgetId = c.getInt(appWidgetIdIndex);
serialNumber= c.getLong(profileIdIndex);
String savedProvider = c.getString(appWidgetProviderIndex);
id = c.getLong(idIndex);
final ComponentName component =
@@ -2224,7 +2227,8 @@ public class LauncherModel extends BroadcastReceiver
final LauncherAppWidgetProviderInfo provider =
LauncherModel.getProviderInfo(context,
ComponentName.unflattenFromString(savedProvider));
ComponentName.unflattenFromString(savedProvider),
mUserManager.getUserForSerialNumber(serialNumber));
final boolean isProviderReady = isValidProvider(provider);
if (!isSafeMode && !customWidget &&
@@ -3344,33 +3348,36 @@ public class LauncherModel extends BroadcastReceiver
public static List<LauncherAppWidgetProviderInfo> getWidgetProviders(Context context,
boolean refresh) {
synchronized (sBgLock) {
if (sBgWidgetProviders != null && !refresh) {
return new ArrayList<LauncherAppWidgetProviderInfo>(sBgWidgetProviders.values());
}
sBgWidgetProviders = new HashMap<ComponentName, LauncherAppWidgetProviderInfo>();
List<AppWidgetProviderInfo> widgets =
AppWidgetManagerCompat.getInstance(context).getAllProviders();
LauncherAppWidgetProviderInfo info;
for (AppWidgetProviderInfo pInfo : widgets) {
info = LauncherAppWidgetProviderInfo.fromProviderInfo(context, pInfo);
sBgWidgetProviders.put(info.provider, info);
}
if (sBgWidgetProviders == null || refresh) {
sBgWidgetProviders = new HashMap<>();
AppWidgetManagerCompat wm = AppWidgetManagerCompat.getInstance(context);
LauncherAppWidgetProviderInfo info;
Collection<CustomAppWidget> customWidgets = Launcher.getCustomAppWidgets().values();
for (CustomAppWidget widget : customWidgets) {
info = new LauncherAppWidgetProviderInfo(context, widget);
sBgWidgetProviders.put(info.provider, info);
List<AppWidgetProviderInfo> widgets = wm.getAllProviders();
for (AppWidgetProviderInfo pInfo : widgets) {
info = LauncherAppWidgetProviderInfo.fromProviderInfo(context, pInfo);
UserHandleCompat user = wm.getUser(info);
sBgWidgetProviders.put(new ComponentKey(info.provider, user), info);
}
Collection<CustomAppWidget> customWidgets = Launcher.getCustomAppWidgets().values();
for (CustomAppWidget widget : customWidgets) {
info = new LauncherAppWidgetProviderInfo(context, widget);
UserHandleCompat user = wm.getUser(info);
sBgWidgetProviders.put(new ComponentKey(info.provider, user), info);
}
}
return new ArrayList<LauncherAppWidgetProviderInfo>(sBgWidgetProviders.values());
}
}
public static LauncherAppWidgetProviderInfo getProviderInfo(Context ctx, ComponentName name) {
public static LauncherAppWidgetProviderInfo getProviderInfo(Context ctx, ComponentName name,
UserHandleCompat user) {
synchronized (sBgLock) {
if (sBgWidgetProviders == null) {
getWidgetProviders(ctx, false /* refresh */);
}
return sBgWidgetProviders.get(name);
return sBgWidgetProviders.get(new ComponentKey(name, user));
}
}
src/com/android/launcher3/Workspace.java
+2 -1
View File
@@ -4974,7 +4974,8 @@ public class Workspace extends SmoothPagedView
DeferredWidgetRefresh widgetRefresh = new DeferredWidgetRefresh(changedInfo,
mLauncher.getAppWidgetHost());
if (LauncherModel.getProviderInfo(getContext(),
changedInfo.get(0).providerName) != null) {
changedInfo.get(0).providerName,
changedInfo.get(0).user) != null) {
// Re-inflate the widgets which have changed status
widgetRefresh.run();
} else {
src/com/android/launcher3/util/ComponentKey.java
+51
View File
@@ -0,0 +1,51 @@
package com.android.launcher3.util;
/**
* Copyright (C) 2015 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import android.content.ComponentName;
import com.android.launcher3.compat.UserHandleCompat;
import java.util.Arrays;
public class ComponentKey {
public final ComponentName componentName;
public final UserHandleCompat user;
private final int mHashCode;
public ComponentKey(ComponentName componentName, UserHandleCompat user) {
assert (componentName != null);
assert (user != null);
this.componentName = componentName;
this.user = user;
mHashCode = Arrays.hashCode(new Object[] {componentName, user});
}
@Override
public int hashCode() {
return mHashCode;
}
@Override
public boolean equals(Object o) {
ComponentKey other = (ComponentKey) o;
return other.componentName.equals(componentName) && other.user.equals(user);
}
}