Merge "Revert "Control entry visibility by the PACK_THEME_FEATURE_ENABLED"" into main (247d15b2) · Commits · e / os / android_packages_apps_ThemePicker

src/com/android/wallpaper/customization/ui/binder/ThemePickerCustomizationOptionBinder.kt

+1 −8

Original line number	Diff line number	Diff line
		@@ -19,7 +19,6 @@ package com.android.wallpaper.customization.ui.binder
		import android.app.Activity
		import android.content.Context
		import android.content.Intent
		import android.provider.Settings
		import android.view.View
		import android.view.ViewGroup
		import android.widget.ImageView
		@@ -109,12 +108,6 @@ constructor(private val defaultCustomizationOptionsBinder: DefaultCustomizationO

		val isComposeRefactorEnabled = BaseFlags.get().isComposeRefactorEnabled()

		val showPackEntry =
		Settings.Secure.getInt(
		view.context.contentResolver,
		Settings.Secure.PACK_THEME_FEATURE_ENABLED,
		) == 1

		val optionsViewModel =
		viewModel.customizationOptionsViewModel as ThemePickerCustomizationOptionsViewModel

		@@ -203,7 +196,7 @@ constructor(private val defaultCustomizationOptionsBinder: DefaultCustomizationO
		var optionPackThemeIconLock: ImageView? = null
		var optionPackThemeHome: View? = null
		var optionPackThemeLock: View? = null
		if (BaseFlags.get().isPackThemeEnabled() && showPackEntry) {
		if (BaseFlags.get().isPackThemeEnabled()) {
		optionPackThemeHome =
		homeScreenCustomizationOptionEntries
		.first { it.first == ThemePickerHomeCustomizationOption.PACK_THEME }

+2 −8

Original line number	Diff line number	Diff line
		@@ -17,7 +17,6 @@
		package com.android.wallpaper.customization.ui.util

		import android.content.Context
		import android.provider.Settings
		import android.view.LayoutInflater
		import android.view.View
		import android.view.ViewGroup
		@@ -74,11 +73,6 @@ constructor(
		customizationOptionsData as ThemePickerCustomizationOptionsData
		val isKeyguardQuickAffordanceEnabled =
		BaseFlags.get().isKeyguardQuickAffordanceEnabled(optionContainer.context)
		val showPackEntry =
		Settings.Secure.getInt(
		context.contentResolver,
		Settings.Secure.PACK_THEME_FEATURE_ENABLED,
		) == 1
		val defaultOptionEntries =
		defaultCustomizationOptionUtil.getOptionEntries(
		customizationOptionsData = customizationOptionsData,
		@@ -90,7 +84,7 @@ constructor(
		LOCK_SCREEN ->
		buildList {
		addAll(defaultOptionEntries)
		if (BaseFlags.get().isPackThemeEnabled() && showPackEntry) {
		if (BaseFlags.get().isPackThemeEnabled()) {
		add(
		ThemePickerHomeCustomizationOption.PACK_THEME to
		layoutInflater.inflate(
		@@ -138,7 +132,7 @@ constructor(
		HOME_SCREEN ->
		buildList {
		addAll(defaultOptionEntries)
		if (BaseFlags.get().isPackThemeEnabled() && showPackEntry) {
		if (BaseFlags.get().isPackThemeEnabled()) {
		add(
		ThemePickerHomeCustomizationOption.PACK_THEME to
		layoutInflater.inflate(