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

Commit e710a70a authored by Josh's avatar Josh
Browse files

Removed keyboard Shortcut customizer flag usages from Code 

Test: EXEMPT Flag cleanup
Flag: com.android.systemui.keyboard_shortcut_helper_shortcut_customizer
Fix: 439548580
Change-Id: Ifc597c82de41210532e4fa83a7f57e16442dae7d
parent 7a12626a

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/domain/interactor/ShortcutHelperCategoriesInteractor.kt

+2 −9
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.keyboard.shortcut.domain.interactor 


import android.content.Context

import com.android.systemui.Flags.extendedAppsShortcutCategory

import com.android.systemui.Flags.keyboardShortcutHelperShortcutCustomizer

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.dagger.qualifiers.Application

import com.android.systemui.keyboard.shortcut.data.repository.ShortcutCategoriesRepository
@@ -43,16 +42,10 @@ class ShortcutHelperCategoriesInteractor 
constructor(

    @Application private val context: Context,

    @DefaultShortcutCategories defaultCategoriesRepository: ShortcutCategoriesRepository,

    @CustomShortcutCategories customCategoriesRepositoryLazy: Lazy<ShortcutCategoriesRepository>,

    @CustomShortcutCategories customCategoriesRepository: ShortcutCategoriesRepository,

    @AppsShortcutCategories appsShortcutCategoryRepositoryLazy: Lazy<ShortcutCategoriesRepository>,

    customizationModeInteractor: ShortcutHelperCustomizationModeInteractor,

) {

    private val customShortcutCategories =

        if (keyboardShortcutHelperShortcutCustomizer()) {

            customCategoriesRepositoryLazy.get().categories

        } else {

            flowOf(emptyList())

        }

    private val appsShortcutCategories =

        if (extendedAppsShortcutCategory()) {

            appsShortcutCategoryRepositoryLazy.get().categories
@@ -63,7 +56,7 @@ constructor( 
    val shortcutCategories: Flow<List<ShortcutCategory>> =

        combine(

            defaultCategoriesRepository.categories,

            customShortcutCategories,

            customCategoriesRepository.categories,

            appsShortcutCategories,

            customizationModeInteractor.isCustomizationModeEnabled,

        ) {

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/composable/ShortcutHelperDualPane.kt

+11 −15
Original line number Diff line number Diff line
@@ -62,7 +62,6 @@ fun ShortcutHelperDualPane( 
            Box(modifier = Modifier.width(412.dp), contentAlignment = Alignment.Center) {

                TitleBar(uiState.isCustomizationModeEnabled)

            }

            if (uiState.isShortcutCustomizerFlagEnabled) {

            CustomizationButtonsContainer(

                modifier = Modifier.weight(1f),

                isCustomizing = uiState.isCustomizationModeEnabled,
@@ -74,9 +73,6 @@ fun ShortcutHelperDualPane( 
                },

                shouldShowResetButton = uiState.shouldShowResetButton,

            )

            } else {

                Spacer(modifier = Modifier.weight(1f))

            }

        }

        Spacer(modifier = Modifier.height(12.dp))

        Row(Modifier.fillMaxWidth()) {

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/model/ShortcutsUiState.kt

+0 −1
Original line number Diff line number Diff line
@@ -24,7 +24,6 @@ sealed interface ShortcutsUiState { 
        val searchQuery: String,

        val shortcutCategories: List<ShortcutCategoryUi>,

        val defaultSelectedCategory: ShortcutCategoryType?,

        val isShortcutCustomizerFlagEnabled: Boolean = false,

        val isExtendedAppCategoryFlagEnabled: Boolean = false,

        val shouldShowResetButton: Boolean = false,

        val isCustomizationModeEnabled: Boolean = false,

packages/SystemUI/src/com/android/systemui/keyboard/shortcut/ui/viewmodel/ShortcutHelperViewModel.kt

+0 −3
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ import androidx.compose.material.icons.filled.Tv 
import androidx.compose.material.icons.filled.VerticalSplit

import com.android.compose.ui.graphics.painter.DrawablePainter

import com.android.systemui.Flags.extendedAppsShortcutCategory

import com.android.systemui.Flags.keyboardShortcutHelperShortcutCustomizer

import com.android.systemui.dagger.qualifiers.Background

import com.android.systemui.keyboard.shortcut.domain.interactor.ShortcutHelperCategoriesInteractor

import com.android.systemui.keyboard.shortcut.domain.interactor.ShortcutHelperCustomizationModeInteractor
@@ -108,8 +107,6 @@ constructor( 
                        searchQuery = query,

                        shortcutCategories = shortcutCategoriesUi,

                        defaultSelectedCategory = getDefaultSelectedCategory(filteredCategories),

                        isShortcutCustomizerFlagEnabled =

                            keyboardShortcutHelperShortcutCustomizer(),

                        isExtendedAppCategoryFlagEnabled = extendedAppsShortcutCategory(),

                        shouldShowResetButton = shouldShowResetButton(shortcutCategoriesUi),

                        isCustomizationModeEnabled = isCustomizationModeEnabled,

packages/SystemUI/tests/utils/src/com/android/systemui/keyboard/shortcut/KeyboardShortcutHelperKosmos.kt

+1 −1
Original line number Diff line number Diff line
@@ -210,7 +210,7 @@ val Kosmos.shortcutHelperCategoriesInteractor by 
        ShortcutHelperCategoriesInteractor(

            context = applicationContext,

            defaultShortcutCategoriesRepository,

            customCategoriesRepositoryLazy = { customShortcutCategoriesRepository },

            customCategoriesRepository = customShortcutCategoriesRepository,

            appsShortcutCategoryRepositoryLazy = { appsShortcutCategoryRepository },

            customizationModeInteractor = shortcutHelperCustomizationModeInteractor,

        )