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

Commit 874bb7c4 authored by George Lin's avatar George Lin
Browse files

Removed the new picker ui flag 

Removed the picker ui flag since we created a new one under
systemui.shared so that the Launcher can also use the flag.

Test: Build success
Bug: 339081035
Flag: com.android.systemui.shared.new_customization_picker_ui
Change-Id: I969cc2689864aef0de4a5c4de096877d842bcc69
parent fc736be4

packages/SystemUI/aconfig/systemui.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -1365,13 +1365,6 @@ flag { 
   bug: "341968766"

}



flag {

    name: "new_picker_ui"

    namespace: "systemui"

    description: "Enables the BC25 design of the customization picker UI."

    bug: "339081035"

}



flag {

  namespace: "systemui"

  name: "settings_ext_register_content_observer_on_bg_thread"

packages/SystemUI/src/com/android/systemui/keyguard/NewPickerUiKeyguardPreview.kt

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2024 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.keyguard



import com.android.systemui.Flags



/** Helper for reading or using the new picker UI flag. */

@Suppress("NOTHING_TO_INLINE")

object NewPickerUiKeyguardPreview {



    /** Is the new picker UI enabled */

    @JvmStatic

    inline val isEnabled

        get() = Flags.newPickerUi()

}

packages/SystemUI/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModel.kt

+3 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ package com.android.systemui.keyguard.ui.viewmodel 
import androidx.annotation.VisibleForTesting

import com.android.app.tracing.FlowTracing.traceEmissionCount

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

import com.android.systemui.keyguard.NewPickerUiKeyguardPreview

import com.android.systemui.keyguard.domain.interactor.KeyguardInteractor

import com.android.systemui.keyguard.domain.interactor.KeyguardQuickAffordanceInteractor

import com.android.systemui.keyguard.domain.interactor.KeyguardTransitionInteractor
@@ -29,6 +28,7 @@ import com.android.systemui.keyguard.shared.model.KeyguardState 
import com.android.systemui.keyguard.shared.quickaffordance.ActivationState

import com.android.systemui.keyguard.shared.quickaffordance.KeyguardQuickAffordancePosition

import com.android.systemui.shade.domain.interactor.ShadeInteractor

import com.android.systemui.shared.Flags

import com.android.systemui.shared.keyguard.shared.model.KeyguardQuickAffordanceSlots

import com.android.systemui.utils.coroutines.flow.flatMapLatestConflated

import javax.inject.Inject
@@ -169,7 +169,7 @@ constructor( 


    /** An observable for the view-model of the "start button" quick affordance. */

    val startButton: Flow<KeyguardQuickAffordanceViewModel> =

        if (NewPickerUiKeyguardPreview.isEnabled) {

        if (Flags.newCustomizationPickerUi()) {

            previewAffordances.flatMapLatestConflated {

                button(

                    position = KeyguardQuickAffordancePosition.BOTTOM_START,
@@ -184,7 +184,7 @@ constructor( 


    /** An observable for the view-model of the "end button" quick affordance. */

    val endButton: Flow<KeyguardQuickAffordanceViewModel> =

        if (NewPickerUiKeyguardPreview.isEnabled) {

        if (Flags.newCustomizationPickerUi()) {

            previewAffordances.flatMapLatestConflated {

                button(

                    position = KeyguardQuickAffordancePosition.BOTTOM_END,

packages/SystemUI/tests/src/com/android/systemui/keyguard/ui/viewmodel/KeyguardQuickAffordancesCombinedViewModelTest.kt

+1 −1
Original line number Diff line number Diff line
@@ -403,7 +403,7 @@ class KeyguardQuickAffordancesCombinedViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(com.android.systemui.Flags.FLAG_NEW_PICKER_UI)

    @EnableFlags(com.android.systemui.shared.Flags.FLAG_NEW_CUSTOMIZATION_PICKER_UI)

    fun startButton_inPreviewMode_onPreviewQuickAffordanceSelected() =

        testScope.runTest {

            underTest.onPreviewSlotSelected(KeyguardQuickAffordanceSlots.SLOT_ID_BOTTOM_START)