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

Commit 5036f199 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "OverlayManager API fixes" into ub-launcher3-master

parents 78672f8e 3fe04470

src/com/android/customization/model/theme/DefaultThemeProvider.java

+6 −5
Original line number Diff line number Diff line
@@ -103,11 +103,12 @@ public class DefaultThemeProvider extends ResourcesApkProvider implements ThemeB 


        Consumer<OverlayInfo> addToMap = overlayInfo -> mOverlayInfos.put(

                overlayInfo.packageName, overlayInfo);

        om.getOverlayInfosForTarget(ANDROID_PACKAGE, UserHandle.myUserId()).forEach(addToMap);

        om.getOverlayInfosForTarget(SYSUI_PACKAGE, UserHandle.myUserId()).forEach(addToMap);

        om.getOverlayInfosForTarget(SETTINGS_PACKAGE, UserHandle.myUserId()).forEach(addToMap);

        om.getOverlayInfosForTarget(ResourceConstants.getLauncherPackage(context),

                UserHandle.myUserId()).forEach(addToMap);



        UserHandle user = UserHandle.of(UserHandle.myUserId());

        om.getOverlayInfosForTarget(ANDROID_PACKAGE, user).forEach(addToMap);

        om.getOverlayInfosForTarget(SYSUI_PACKAGE, user).forEach(addToMap);

        om.getOverlayInfosForTarget(SETTINGS_PACKAGE, user).forEach(addToMap);

        om.getOverlayInfosForTarget(ResourceConstants.getLauncherPackage(context),user).forEach(addToMap);

        mShapePreviewIconPackages = context.getResources().getStringArray(

                R.array.icon_shape_preview_packages);

    }

src/com/android/customization/model/theme/OverlayManagerCompat.java

+5 −3
Original line number Diff line number Diff line
@@ -49,7 +49,8 @@ public class OverlayManagerCompat { 
     * @return true if the operation succeeded

     */

    public boolean setEnabledExclusiveInCategory(String packageName, int userId) {

        return mOverlayManager.setEnabledExclusiveInCategory(packageName, userId);

        mOverlayManager.setEnabledExclusiveInCategory(packageName, UserHandle.of(userId));

        return true;

    }



    /**
@@ -57,7 +58,8 @@ public class OverlayManagerCompat { 
     * @return true if the operation succeeded

     */

    public boolean disableOverlay(String packageName, int userId) {

        return mOverlayManager.setEnabled(packageName, false, userId);

        mOverlayManager.setEnabled(packageName, false, UserHandle.of(userId));

        return true;

    }



    /**
@@ -119,7 +121,7 @@ public class OverlayManagerCompat { 




    private List<OverlayInfo> getOverlayInfosForTarget(String targetPackageName, int userId) {

        return mOverlayManager.getOverlayInfosForTarget(targetPackageName, userId);

        return mOverlayManager.getOverlayInfosForTarget(targetPackageName, UserHandle.of(userId));

    }



    private void addAllEnabledOverlaysForTarget(Map<String, String> overlays, String target) {