Snap for 7514518 from 3f62f8a220ccdcdf517fbd974826160c396765f0 to sc-release (4c7ca719) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/customization/model/themedicon/ThemedIconSectionController.java

+25 −5

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@
		package com.android.customization.model.themedicon;

		import android.content.Context;
		import android.os.Bundle;
		import android.view.LayoutInflater;

		import androidx.annotation.Nullable;
		@@ -29,14 +30,24 @@ import com.android.wallpaper.model.WorkspaceViewModel;
		public class ThemedIconSectionController implements
		CustomizationSectionController<ThemedIconSectionView> {

		private static final String KEY_THEMED_ICON_ENABLED = "SAVED_THEMED_ICON_ENABLED";

		private final ThemedIconSwitchProvider mThemedIconOptionsProvider;
		private final WorkspaceViewModel mWorkspaceViewModel;

		private ThemedIconSectionView mThemedIconSectionView;
		private boolean mSavedThemedIconEnabled = false;


		public ThemedIconSectionController(ThemedIconSwitchProvider themedIconOptionsProvider,
		WorkspaceViewModel workspaceViewModel) {
		WorkspaceViewModel workspaceViewModel, @Nullable Bundle savedInstanceState) {
		mThemedIconOptionsProvider = themedIconOptionsProvider;
		mWorkspaceViewModel = workspaceViewModel;

		if (savedInstanceState != null) {
		mSavedThemedIconEnabled = savedInstanceState.getBoolean(
		KEY_THEMED_ICON_ENABLED, /* defaultValue= */ false);
		}
		}

		@Override
		@@ -46,13 +57,14 @@ public class ThemedIconSectionController implements

		@Override
		public ThemedIconSectionView createView(Context context) {
		ThemedIconSectionView themedIconColorSectionView =
		mThemedIconSectionView =
		(ThemedIconSectionView) LayoutInflater.from(context).inflate(
		R.layout.themed_icon_section_view, /* root= */ null);
		themedIconColorSectionView.setViewListener(this::onViewActivated);
		mThemedIconSectionView.setViewListener(this::onViewActivated);
		mThemedIconSectionView.getSwitch().setChecked(mSavedThemedIconEnabled);
		mThemedIconOptionsProvider.fetchThemedIconEnabled(
		enabled -> themedIconColorSectionView.getSwitch().setChecked(enabled));
		return themedIconColorSectionView;
		enabled -> mThemedIconSectionView.getSwitch().setChecked(enabled));
		return mThemedIconSectionView;
		}

		private void onViewActivated(Context context, boolean viewActivated) {
		@@ -62,4 +74,12 @@ public class ThemedIconSectionController implements
		mThemedIconOptionsProvider.setThemedIconEnabled(viewActivated);
		mWorkspaceViewModel.getUpdateWorkspace().setValue(viewActivated);
		}

		@Override
		public void onSaveInstanceState(Bundle savedInstanceState) {
		if (mThemedIconSectionView != null) {
		savedInstanceState.putBoolean(KEY_THEMED_ICON_ENABLED,
		mThemedIconSectionView.getSwitch().isChecked());
		}
		}
		}

src/com/android/customization/module/DefaultCustomizationSections.java

+2 −1

Original line number	Diff line number	Diff line
		@@ -47,7 +47,8 @@ public final class DefaultCustomizationSections implements CustomizationSections

		// Themed app icon section.
		sectionControllers.add(new ThemedIconSectionController(
		ThemedIconSwitchProvider.getInstance(activity), workspaceViewModel));
		ThemedIconSwitchProvider.getInstance(activity), workspaceViewModel,
		savedInstanceState));

		// App grid section.
		sectionControllers.add(new GridSectionController(