diff options
author | Pinyao Ting <pinyaoting@google.com> | 2019-08-26 14:36:02 -0700 |
---|---|---|
committer | Pinyao Ting <pinyaoting@google.com> | 2019-09-25 15:58:41 -0700 |
commit | 59e908b54f72768efcae3db5897c50010d1fc5f2 (patch) | |
tree | 22af25a40d765647e8e85e07e8265ccbefdf89e5 /src/com/android/launcher3/compat/AppWidgetManagerCompat.java | |
parent | 0b72d6a8913012f3f3aab2c28924185accbb6cb4 (diff) | |
download | android_packages_apps_Trebuchet-59e908b54f72768efcae3db5897c50010d1fc5f2.tar.gz android_packages_apps_Trebuchet-59e908b54f72768efcae3db5897c50010d1fc5f2.tar.bz2 android_packages_apps_Trebuchet-59e908b54f72768efcae3db5897c50010d1fc5f2.zip |
migrate custom widgets in comply with plugin framework
Bug: 139888225
Change-Id: I8a3d0fe2689ad5ba24b19309728bbad0b6287f71
Merged-In: I8a3d0fe2689ad5ba24b19309728bbad0b6287f71
(cherry picked from commit c7a6c2979cc063dd493316d0d19cbc0501a23a64)
Diffstat (limited to 'src/com/android/launcher3/compat/AppWidgetManagerCompat.java')
-rw-r--r-- | src/com/android/launcher3/compat/AppWidgetManagerCompat.java | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java index 32432561b..fc5d11c23 100644 --- a/src/com/android/launcher3/compat/AppWidgetManagerCompat.java +++ b/src/com/android/launcher3/compat/AppWidgetManagerCompat.java @@ -23,19 +23,18 @@ import android.content.Context; import android.os.Bundle; import android.os.UserHandle; +import androidx.annotation.Nullable; + import com.android.launcher3.LauncherAppWidgetInfo; import com.android.launcher3.LauncherAppWidgetProviderInfo; import com.android.launcher3.Utilities; -import com.android.launcher3.config.FeatureFlags; import com.android.launcher3.util.ComponentKey; import com.android.launcher3.util.PackageUserKey; -import com.android.launcher3.widget.custom.CustomWidgetParser; +import com.android.launcher3.widget.custom.CustomWidgetManager; import java.util.HashMap; import java.util.List; -import androidx.annotation.Nullable; - public abstract class AppWidgetManagerCompat { private static final Object sInstanceLock = new Object(); @@ -63,11 +62,9 @@ public abstract class AppWidgetManagerCompat { } public LauncherAppWidgetProviderInfo getLauncherAppWidgetInfo(int appWidgetId) { - if (FeatureFlags.ENABLE_CUSTOM_WIDGETS - && appWidgetId <= LauncherAppWidgetInfo.CUSTOM_WIDGET_ID) { - return CustomWidgetParser.getWidgetProvider(mContext, appWidgetId); + if (appWidgetId <= LauncherAppWidgetInfo.CUSTOM_WIDGET_ID) { + return CustomWidgetManager.INSTANCE.get(mContext).getWidgetProvider(appWidgetId); } - AppWidgetProviderInfo info = mAppWidgetManager.getAppWidgetInfo(appWidgetId); return info == null ? null : LauncherAppWidgetProviderInfo.fromProviderInfo(mContext, info); } |