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

Commit be92b78d authored by George Lin's avatar George Lin Committed by Android (Google) Code Review
Browse files

Revert "Control entry visibility by the PACK_THEME_FEATURE_ENABLED" 

This reverts commit 3ac5b34a.

Reason for revert: b/411140074

Change-Id: I7669c85c03078487fbf0788b043c8b877def07a4
parent 3ac5b34a

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
@@ -107,12 +106,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
@@ -201,7 +194,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 }

src/com/android/wallpaper/customization/ui/util/ThemePickerCustomizationOptionUtil.kt

+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(