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

Commit 9221a6a0 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Remove enabling overlays from ThemePicker. 

Bug: 126238021
Test: make; change overlays
Change-Id: Ie67083cdeb13e12b8b01eaf94222f201e781ec17
parent 7fdb452b

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

+1 −12
Original line number Diff line number Diff line
@@ -196,22 +196,11 @@ public class ThemeManager implements CustomizationManager<ThemeBundle> { 
    }



    private boolean disableCurrentOverlay(String targetPackage, String category) {

        String currentPackageName = mOverlayManagerCompat.getEnabledPackageName(targetPackage,

                category);

        if (currentPackageName != null) {

           return mOverlayManagerCompat.disableOverlay(currentPackageName, UserHandle.myUserId());

        }

        return true;

    }



    private boolean applyOverlayOrDefault(ThemeBundle theme, String targetPkg, String category) {

        String themePackage = theme.getPackagesByCategory().get(category);

        if (!TextUtils.isEmpty(themePackage)) {

            return mOverlayManagerCompat.setEnabledExclusiveInCategory(themePackage,

                    UserHandle.myUserId());

        } else {

            return disableCurrentOverlay(targetPkg, category);

        }

        return true;

    }



    public Map<String, String> getCurrentOverlays() {