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

Commit 4006b3f2 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Merging ub-launcher3-master, build 5345913 

Test: Manual

Fixes: 124786795
Change-Id: I25110bc2253fa8c1c90def3ec572f7b1b0f034ac
parents 543f2ca3 5ac371b2

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

+6 −1
Original line number Diff line number Diff line
@@ -56,6 +56,8 @@ import java.util.function.Consumer; 
public class DefaultThemeProvider extends ResourcesApkProvider implements ThemeBundleProvider {



    private static final String TAG = "DefaultThemeProvider";

    // TODO(b/124796742): remove once custom theme picker is ready to merge

    private static final boolean SHOW_CUSTOM_THEME_OPTION = false;



    private static final String THEMES_ARRAY = "themes";

    private static final String TITLE_PREFIX = "theme_title_";
@@ -227,8 +229,11 @@ public class DefaultThemeProvider extends ResourcesApkProvider implements ThemeB 
                        e);

            }

        }



        if (SHOW_CUSTOM_THEME_OPTION) {

            addCustomTheme();

        }

    }



    /**

     * Default theme requires different treatment: if there are overlay packages specified in the

src/com/android/customization/picker/theme/ThemeFragment.java

+5 −2
Original line number Diff line number Diff line
@@ -182,7 +182,6 @@ public class ThemeFragment extends ToolbarFragment { 
    private void setUpOptions(@Nullable Bundle savedInstanceState) {

        mThemeManager.fetchOptions(options -> {

            mOptionsController = new OptionSelectorController(mOptionsContainer, options);



            mOptionsController.addListener(selected -> {

                if (selected instanceof CustomTheme && !((CustomTheme) selected).isDefined()) {

                    navigateToCustomTheme();
@@ -195,7 +194,6 @@ public class ThemeFragment extends ToolbarFragment { 
            mOptionsController.initOptions(mThemeManager);

            String previouslySelected = savedInstanceState != null

                    ? savedInstanceState.getString(KEY_SELECTED_THEME) : null;



            for (ThemeBundle theme : options) {

                if (previouslySelected != null

                        && previouslySelected.equals(theme.getSerializedPackages())) {
@@ -205,6 +203,11 @@ public class ThemeFragment extends ToolbarFragment { 
                    break;

                }

            }

            if (mSelectedTheme == null) {

                // Select the default theme if there is no matching custom enabled theme

                // TODO(b/124796742): default to custom if there is no matching theme bundle

                mSelectedTheme = options.get(0);

            }

            mOptionsController.setSelectedOption(mSelectedTheme);

        });

        createAdapter();