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

Commit f71648d6 authored by Joshua Mokut's avatar Joshua Mokut Committed by Android (Google) Code Review
Browse files

Merge changes I27f045df,Ifc597c82,Ia5c4972d into main 

* changes:
  Removed Keyboard_shortcut_helper_shortcut_customizer flag
  Removed keyboard Shortcut customizer flag usages from Code
  Removed shortcut helper customizer flag usages from tests
parents 29cad33d e8ccdeb4

packages/SystemUI/aconfig/systemui.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -1589,13 +1589,6 @@ flag { 
  }

}



flag {

    name: "keyboard_shortcut_helper_shortcut_customizer"

    namespace: "systemui"

    description: "An implementation of shortcut customizations through shortcut helper."

    bug: "365064144"

}



flag {

    name: "keyguard_transition_force_finish_on_screen_off"

    namespace: "systemui"

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

+1 −20
Original line number Diff line number Diff line
@@ -31,7 +31,6 @@ import com.android.systemui.keyboard.shortcut.appsShortcutCategoryRepository 
import com.android.systemui.keyboard.shortcut.data.repository.FakeAppsShortcutCategoryRepository

import com.android.systemui.keyboard.shortcut.data.source.FakeKeyboardShortcutGroupsSource

import com.android.systemui.keyboard.shortcut.data.source.TestShortcuts

import com.android.systemui.keyboard.shortcut.data.source.TestShortcuts.allCustomizableInputGesturesWithSimpleShortcutCombinations

import com.android.systemui.keyboard.shortcut.data.source.TestShortcuts.customInputGestureTypeHome

import com.android.systemui.keyboard.shortcut.data.source.TestShortcuts.groupWithGoHomeShortcutInfo

import com.android.systemui.keyboard.shortcut.data.source.TestShortcuts.systemCategoryWithCustomHomeShortcut
@@ -291,24 +290,7 @@ class ShortcutHelperCategoriesInteractorTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_KEYBOARD_SHORTCUT_HELPER_SHORTCUT_CUSTOMIZER)

    fun categories_excludesCustomShortcutsWhenFlagIsOff() {

        testScope.runTest {

            setCustomInputGestures(allCustomizableInputGesturesWithSimpleShortcutCombinations)

            helper.showFromActivity()

            val categories by collectLastValue(interactor.shortcutCategories)

            assertThat(categories)

                .containsExactly(

                    TestShortcuts.systemCategory,

                    TestShortcuts.multitaskingCategory,

                    TestShortcuts.imeCategory,

                )

        }

    }



    @Test

    @EnableFlags(Flags.FLAG_KEYBOARD_SHORTCUT_HELPER_SHORTCUT_CUSTOMIZER)

    fun categories_includesCustomShortcutsWhenFlagIsOn() {

    fun categories_includesCustomShortcuts() {

        testScope.runTest {

            setCustomInputGestures(listOf(customInputGestureTypeHome))

            helper.showFromActivity()
@@ -323,7 +305,6 @@ class ShortcutHelperCategoriesInteractorTest : SysuiTestCase() { 
    }



    @Test

    @EnableFlags(Flags.FLAG_KEYBOARD_SHORTCUT_HELPER_SHORTCUT_CUSTOMIZER)

    fun categories_correctlyMergesDefaultAndCustomShortcutsOfSameType() {

        testScope.runTest {

            setCustomInputGestures(listOf(customInputGestureTypeHome))

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,