Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 224daede authored by Adam Cohen's avatar Adam Cohen Committed by Android Git Automerger
Browse files

am 035352b4: Merge "Making sure keyguard and homescreen only display eligible... 

am 035352b4: Merge "Making sure keyguard and homescreen only display eligible widgets (issue 7550090)" into jb-mr1.1-dev

* commit '035352b4':
  Making sure keyguard and homescreen only display eligible widgets (issue 7550090)
parents 10659cb1 035352b4

core/java/android/appwidget/AppWidgetManager.java

+12 −1
Original line number Diff line number Diff line
@@ -544,8 +544,19 @@ public class AppWidgetManager { 
     * Return a list of the AppWidget providers that are currently installed.

     */

    public List<AppWidgetProviderInfo> getInstalledProviders() {

        return getInstalledProviders(AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN);

    }



    /**

     * Return a list of the AppWidget providers that are currently installed.

     *

     * @param categoryFilter Will only return providers which register as any of the specified

     *        specified categories. See {@link AppWidgetProviderInfo#widgetCategory}.

     * @hide

     */

    public List<AppWidgetProviderInfo> getInstalledProviders(int categoryFilter) {

        try {

            List<AppWidgetProviderInfo> providers = sService.getInstalledProviders();

            List<AppWidgetProviderInfo> providers = sService.getInstalledProviders(categoryFilter);

            for (AppWidgetProviderInfo info : providers) {

                // Converting complex to dp.

                info.minWidth =

core/java/com/android/internal/appwidget/IAppWidgetService.aidl

+1 −1
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ interface IAppWidgetService { 
    void partiallyUpdateAppWidgetIds(in int[] appWidgetIds, in RemoteViews views);

    void updateAppWidgetProvider(in ComponentName provider, in RemoteViews views);

    void notifyAppWidgetViewDataChanged(in int[] appWidgetIds, int viewId);

    List<AppWidgetProviderInfo> getInstalledProviders();

    List<AppWidgetProviderInfo> getInstalledProviders(int categoryFilter);

    AppWidgetProviderInfo getAppWidgetInfo(int appWidgetId);

    boolean hasBindAppWidgetPermission(in String packageName);

    void setBindAppWidgetPermission(in String packageName, in boolean permission);

services/java/com/android/server/AppWidgetService.java

+3 −2
Original line number Diff line number Diff line
@@ -281,8 +281,9 @@ class AppWidgetService extends IAppWidgetService.Stub 
    }



    @Override

    public List<AppWidgetProviderInfo> getInstalledProviders() throws RemoteException {

        return getImplForUser(getCallingOrCurrentUserId()).getInstalledProviders();

    public List<AppWidgetProviderInfo> getInstalledProviders(int categoryFilter)

            throws RemoteException {

        return getImplForUser(getCallingOrCurrentUserId()).getInstalledProviders(categoryFilter);

    }



    @Override

services/java/com/android/server/AppWidgetServiceImpl.java

+1 −5
Original line number Diff line number Diff line
@@ -859,11 +859,7 @@ class AppWidgetServiceImpl { 
        }

    }



    public List<AppWidgetProviderInfo> getInstalledProviders() {

        return getInstalledProviders(AppWidgetProviderInfo.WIDGET_CATEGORY_HOME_SCREEN);

    }



    private List<AppWidgetProviderInfo> getInstalledProviders(int categoryFilter) {

    public List<AppWidgetProviderInfo> getInstalledProviders(int categoryFilter) {

        synchronized (mAppWidgetIds) {

            ensureStateLoadedLocked();

            final int N = mInstalledProviders.size();