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

Commit 59555759 authored by bobyang's avatar bobyang
Browse files

Control entry visibility by the PACK_THEME_FEATURE_ENABLED with default 

The previous issue is because of the no default value, update the cl and
commit again.

Bug: 398982575
Flag: EXEMPT refactor
Test: Tested by building and installing picker on local, checking if we
get data from pack

Change-Id: I4640985debb18991570110297254ebbb150db012
parent d42c56a0

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

+9 −1
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.app.Activity 
import android.content.Context

import android.content.Intent

import android.graphics.drawable.AdaptiveIconDrawable

import android.provider.Settings

import android.view.View

import android.view.ViewGroup

import android.widget.ImageView
@@ -110,6 +111,13 @@ constructor(private val defaultCustomizationOptionsBinder: DefaultCustomizationO 


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



        val showPackEntry =

            Settings.Secure.getInt(

                view.context.contentResolver,

                Settings.Secure.PACK_THEME_FEATURE_ENABLED,

                /* def= */ 0,

            ) == 1



        val optionsViewModel =

            viewModel.customizationOptionsViewModel as ThemePickerCustomizationOptionsViewModel
@@ -198,7 +206,7 @@ constructor(private val defaultCustomizationOptionsBinder: DefaultCustomizationO 
        var optionPackThemeIconLock: ImageView? = null

        var optionPackThemeHome: View? = null

        var optionPackThemeLock: View? = null

        if (BaseFlags.get().isPackThemeEnabled()) {

        if (BaseFlags.get().isPackThemeEnabled() && showPackEntry) {

            optionPackThemeHome =

                homeScreenCustomizationOptionEntries

                    .first { it.first == ThemePickerHomeCustomizationOption.PACK_THEME }

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

+9 −2
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
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
@@ -73,6 +74,12 @@ constructor( 
        customizationOptionsData as ThemePickerCustomizationOptionsData

        val isKeyguardQuickAffordanceEnabled =

            BaseFlags.get().isKeyguardQuickAffordanceEnabled(optionContainer.context)

        val showPackEntry =

            Settings.Secure.getInt(

                context.contentResolver,

                Settings.Secure.PACK_THEME_FEATURE_ENABLED,

                /* def= */ 0,

            ) == 1

        val defaultOptionEntries =

            defaultCustomizationOptionUtil.getOptionEntries(

                customizationOptionsData = customizationOptionsData,
@@ -84,7 +91,7 @@ constructor( 
            LOCK_SCREEN ->

                buildList {

                    addAll(defaultOptionEntries)

                    if (BaseFlags.get().isPackThemeEnabled()) {

                    if (BaseFlags.get().isPackThemeEnabled() && showPackEntry) {

                        add(

                            ThemePickerHomeCustomizationOption.PACK_THEME to

                                layoutInflater.inflate(
@@ -132,7 +139,7 @@ constructor( 
            HOME_SCREEN ->

                buildList {

                    addAll(defaultOptionEntries)

                    if (BaseFlags.get().isPackThemeEnabled()) {

                    if (BaseFlags.get().isPackThemeEnabled() && showPackEntry) {

                        add(

                            ThemePickerHomeCustomizationOption.PACK_THEME to

                                layoutInflater.inflate(