diff options
| -rw-r--r-- | res/values/strings.xml | 4 | ||||
| -rw-r--r-- | src/com/android/mail/widget/BaseWidgetProvider.java | 13 | ||||
| -rw-r--r-- | src/com/android/mail/widget/WidgetProvider.java | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/res/values/strings.xml b/res/values/strings.xml index a71166611..1d3cf153b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -935,4 +935,8 @@ <string name="show_n_more_folders">Show <xliff:g id="number">%1$s</xliff:g> more folders</string> <!-- Button in conversation list to hide folders [CHAR LIMIT=50] --> <string name="hide_folders">Hide folders</string> + + <!-- Provider name for widgets --> + <string name="widget_provider" translatable="false">com.android.mail.widget.WidgetProvider</string> + </resources> diff --git a/src/com/android/mail/widget/BaseWidgetProvider.java b/src/com/android/mail/widget/BaseWidgetProvider.java index 98a5ad67f..4719a1f60 100644 --- a/src/com/android/mail/widget/BaseWidgetProvider.java +++ b/src/com/android/mail/widget/BaseWidgetProvider.java @@ -76,15 +76,20 @@ public abstract class BaseWidgetProvider extends AppWidgetProvider { MailPrefs.get(context).clearWidgets(appWidgetIds); } + public static String getProviderName(Context context) { + return context.getString(R.string.widget_provider); + } + /** - * If a widget provider extends this class, this method needs to be overriden, so the correct - * widget ids are returned. + * Note: this method calls {@link BaseWidgetProvider#getProviderName} and thus returns widget + * IDs based on the widget_provider string resource. When subclassing, be sure to either + * override this method or provide the correct provider name in the string resource. + * * @return the list ids for the currently configured widgets. */ protected int[] getCurrentWidgetIds(Context context) { final AppWidgetManager appWidgetManager = AppWidgetManager.getInstance(context); - final ComponentName mailComponent = - new ComponentName(context, WidgetProvider.PROVIDER_NAME); + final ComponentName mailComponent = new ComponentName(context, getProviderName(context)); return appWidgetManager.getAppWidgetIds(mailComponent); } diff --git a/src/com/android/mail/widget/WidgetProvider.java b/src/com/android/mail/widget/WidgetProvider.java index b7f3efc8f..f88aa2777 100644 --- a/src/com/android/mail/widget/WidgetProvider.java +++ b/src/com/android/mail/widget/WidgetProvider.java @@ -19,8 +19,6 @@ package com.android.mail.widget; import android.content.Context; public class WidgetProvider extends BaseWidgetProvider { - public static final String PROVIDER_NAME = "com.android.mail.widget.WidgetProvider"; - @Override protected void migrateLegacyWidgetInformation(Context context, int widgetId) { // Do nothing, as there is no migration for UnifiedEmail |