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

Commit 4035b79b authored by Santiago Etchebehere's avatar Santiago Etchebehere
Browse files

Merging from ub-launcher3-rvc-qpr-dev @ build 6861538 

Bug:150504032
Test: manual, presubmit on the source branch
x20/teams/android-launcher/merge/ub-launcher3-rvc-qpr-dev_rvc-qpr-dev_6861538.html

Change-Id: I1a17e523b95cf28220c9a6a4114d2019dda5545d
parents fbbfb566 f2a95df2

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

+2 −4
Original line number Diff line number Diff line
@@ -188,18 +188,16 @@ public class DefaultThemeProvider extends ResourcesApkProvider implements ThemeB 
            builder.setTitle(mContext.getString(R.string.default_theme_title));

        }



        String colorOverlayPackage = getOverlayPackage(COLOR_PREFIX, DEFAULT_THEME_NAME);



        try {

            String colorOverlayPackage = getOverlayPackage(COLOR_PREFIX, DEFAULT_THEME_NAME);

            mOverlayProvider.addColorOverlay(builder, colorOverlayPackage);

        } catch (NameNotFoundException | NotFoundException e) {

            Log.d(TAG, "Didn't find color overlay for default theme, will use system default");

            mOverlayProvider.addSystemDefaultColor(builder);

        }



        String fontOverlayPackage = getOverlayPackage(FONT_PREFIX, DEFAULT_THEME_NAME);



        try {

            String fontOverlayPackage = getOverlayPackage(FONT_PREFIX, DEFAULT_THEME_NAME);

            mOverlayProvider.addFontOverlay(builder, fontOverlayPackage);

        } catch (NameNotFoundException | NotFoundException e) {

            Log.d(TAG, "Didn't find font overlay for default theme, will use system default");

src/com/android/customization/picker/CustomizationPickerActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -124,6 +124,8 @@ public class CustomizationPickerActivity extends FragmentActivity implements Wal 
            return;

        }



        mDelegate.getCategoryProvider().resetIfNeeded();



        setContentView(R.layout.activity_customization_picker_main);

        setUpBottomNavView();

        mBottomActionBar = findViewById(R.id.bottom_actionbar);