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

Commit 38675745 authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Update to match new OverlayInfo API 

Use getters instead of fields directly.

Change-Id: I53166e2e2145155cab164c3059fe5deb31a78459
parent 2e051ea6

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

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ public class DefaultThemeProvider extends ResourcesApkProvider implements ThemeB 
        mOverlayInfos = new HashMap<>();



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

                overlayInfo.packageName, overlayInfo);

                overlayInfo.getPackageName(), overlayInfo);



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

        om.getOverlayInfosForTarget(ANDROID_PACKAGE, user).forEach(addToMap);
@@ -538,7 +538,7 @@ public class DefaultThemeProvider extends ResourcesApkProvider implements ThemeB 
    @Nullable

    private String getOverlayCategory(String packageName) {

       OverlayInfo info = mOverlayInfos.get(packageName);

       return info != null ? info.category : null;

       return info != null ? info.getCategory() : null;

    }



    @Override

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

+5 −5
Original line number Diff line number Diff line
@@ -72,8 +72,8 @@ public class OverlayManagerCompat { 
        List<OverlayInfo> overlayInfos = getOverlayInfosForTarget(targetPackageName,

                UserHandle.myUserId());

        for (OverlayInfo overlayInfo : overlayInfos) {

            if (category.equals(overlayInfo.category) && overlayInfo.isEnabled()) {

                return overlayInfo.packageName;

            if (category.equals(overlayInfo.getCategory()) && overlayInfo.isEnabled()) {

                return overlayInfo.getPackageName();

            }

        }

        return null;
@@ -98,8 +98,8 @@ public class OverlayManagerCompat { 
        for (String target : targetPackages) {

            for (OverlayInfo info

                    : mOverlayByUser.get(userId).getOrDefault(target, Collections.emptyList())) {

                if (category.equals(info.category)) {

                    overlays.add(info.packageName);

                if (category.equals(info.getCategory())) {

                    overlays.add(info.getPackageName());

                }

            }

        }
@@ -128,7 +128,7 @@ public class OverlayManagerCompat { 
        // Can't use mOverlayByUser map as the enabled state might change

        for (OverlayInfo overlayInfo : getOverlayInfosForTarget(target, UserHandle.myUserId())) {

            if (overlayInfo.isEnabled()) {

                overlays.put(overlayInfo.category, overlayInfo.packageName);

                overlays.put(overlayInfo.getCategory(), overlayInfo.getPackageName());

            }

        }

    }