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

Commit dc127eaa authored by Marcelo Arteiro's avatar Marcelo Arteiro
Browse files

Replaces ThemeSettings builder with updater 

Thee new ThemeSettingsUpdater class is independent from ThemeSettings and provides type-safe way to interface with the API without error-prone nullability checkers.

Bug: 333694176
Test: atest FrameworksServicesTests_theme
Flag: android.server.enable_theme_service
Change-Id: I4a4caf10b1b1137e1bb85b588fef633aaa932697
parent 9dd0a7ac

core/java/android/content/theming/FieldColor.java

+3 −2
Original line number Diff line number Diff line
@@ -33,11 +33,12 @@ public class FieldColor extends ThemeSettingsField<Integer, String> { 


    public FieldColor(

            String key,

            BiConsumer<ThemeSettingsUpdater, Integer> setter,

            Function<ThemeSettingsUpdater, Integer> updaterGetter,

            BiConsumer<ThemeSettingsUpdater, Integer> updaterSetter,

            Function<ThemeSettings, Integer> getter,

            ThemeSettings defaults

    ) {

        super(key, setter, getter, defaults);

        super(key, updaterGetter, updaterSetter, getter, defaults);

    }



    @Override

core/java/android/content/theming/FieldColorBoth.java

+3 −2
Original line number Diff line number Diff line
@@ -29,11 +29,12 @@ import java.util.function.Function; 
public class FieldColorBoth extends ThemeSettingsField<Boolean, String> {

    public FieldColorBoth(

            String key,

            BiConsumer<ThemeSettingsUpdater, Boolean> setter,

            Function<ThemeSettingsUpdater, Boolean> updaterGetter,

            BiConsumer<ThemeSettingsUpdater, Boolean> updaterSetter,

            Function<ThemeSettings, Boolean> getter,

            ThemeSettings defaults

    ) {

        super(key, setter, getter, defaults);

        super(key, updaterGetter, updaterSetter, getter, defaults);

    }



    @Override

core/java/android/content/theming/FieldColorIndex.java

+3 −2
Original line number Diff line number Diff line
@@ -26,11 +26,12 @@ import java.util.function.Function; 
public class FieldColorIndex extends ThemeSettingsField<Integer, String> {

    public FieldColorIndex(

            String key,

            BiConsumer<ThemeSettingsUpdater, Integer> setter,

            Function<ThemeSettingsUpdater, Integer> updaterGetter,

            BiConsumer<ThemeSettingsUpdater, Integer> updaterSetter,

            Function<ThemeSettings, Integer> getter,

            ThemeSettings defaults

    ) {

        super(key, setter, getter, defaults);

        super(key, updaterGetter, updaterSetter, getter, defaults);

    }



    @Override

core/java/android/content/theming/FieldColorSource.java

+3 −2
Original line number Diff line number Diff line
@@ -31,11 +31,12 @@ import java.util.function.Function; 
public class FieldColorSource extends ThemeSettingsField<String, String> {

    public FieldColorSource(

            String key,

            BiConsumer<ThemeSettingsUpdater, String> setter,

            Function<ThemeSettingsUpdater, String> updaterGetter,

            BiConsumer<ThemeSettingsUpdater, String> updaterSetter,

            Function<ThemeSettings, String> getter,

            ThemeSettings defaults

    ) {

        super(key, setter, getter, defaults);

        super(key, updaterGetter, updaterSetter, getter, defaults);

    }



    @Override

core/java/android/content/theming/FieldThemeStyle.java

+3 −2
Original line number Diff line number Diff line
@@ -29,11 +29,12 @@ import java.util.function.Function; 
public class FieldThemeStyle extends ThemeSettingsField<Integer, String> {

    public FieldThemeStyle(

            String key,

            BiConsumer<ThemeSettingsUpdater, Integer> setter,

            Function<ThemeSettingsUpdater, Integer> updaterGetter,

            BiConsumer<ThemeSettingsUpdater, Integer> updaterSetter,

            Function<ThemeSettings, Integer> getter,

            ThemeSettings defaults

    ) {

        super(key, setter, getter, defaults);

        super(key, updaterGetter, updaterSetter, getter, defaults);

    }



    private static final @ThemeStyle.Type List<Integer> sValidStyles = Arrays.asList(