aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-03-03 17:36:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removing static access to Context through LauncherAppState

Browse Source 
Bug: 33032833
Change-Id: I09baaa6d79187b3096a2ab3a89d7dcaeaf9eee68
This commit is contained in:
Sunny Goyal
2016-12-29 13:31:43 -08:00
parent c6b833dcbb
commit 8ad02b8f3f
8 changed files with 42 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/launcher3/util/PendingRequestArgs.java
View File

@@ -15,7 +15,9 @@
*/
package com.android.launcher3.util;
import android.appwidget.AppWidgetProviderInfo;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.os.Parcel;
import android.os.Parcelable;
@@ -57,9 +59,8 @@ public class PendingRequestArgs extends ItemInfo implements Parcelable {
mArg1 = parcel.readInt();
mObjectType = parcel.readInt();
if (parcel.readInt() != 0) {
mObject = mObjectType == TYPE_INTENT
? Intent.CREATOR.createFromParcel(parcel)
: new LauncherAppWidgetProviderInfo(parcel);
mObject = (mObjectType == TYPE_INTENT ? Intent.CREATOR : AppWidgetProviderInfo.CREATOR)
.createFromParcel(parcel);
} else {
mObject = null;
}
@@ -86,8 +87,10 @@ public class PendingRequestArgs extends ItemInfo implements Parcelable {
}
}
public LauncherAppWidgetProviderInfo getWidgetProvider() {
return mObjectType == TYPE_APP_WIDGET ? (LauncherAppWidgetProviderInfo) mObject : null;
public LauncherAppWidgetProviderInfo getWidgetProvider(Context context) {
return mObjectType == TYPE_APP_WIDGET ?
LauncherAppWidgetProviderInfo.fromProviderInfo(
context, (AppWidgetProviderInfo) mObject) : null;
}
public int getWidgetId() {
@@ -103,7 +106,7 @@ public class PendingRequestArgs extends ItemInfo implements Parcelable {
}
public static PendingRequestArgs forWidgetInfo(
int appWidgetId, LauncherAppWidgetProviderInfo widgetInfo, ItemInfo info) {
int appWidgetId, AppWidgetProviderInfo widgetInfo, ItemInfo info) {
PendingRequestArgs args = new PendingRequestArgs(appWidgetId, TYPE_APP_WIDGET, widgetInfo);
args.copyFrom(info);
return args;