Snap for 6864616 from 4035b79b1dccdcfe483be79073d18937b49223a2 to rvc-qpr1-release (2c4d2404) · Commits · e / os / android_packages_apps_ThemePicker

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");

+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);