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

Commit 3f2e7077 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Renamed flag hsu_behavior_changes to hsu_qs_changes" into main

parents 6ad68083 aa78dba2

packages/SystemUI/aconfig/systemui.aconfig

+2 −2
Original line number Diff line number Diff line
@@ -1894,9 +1894,9 @@ flag { 
}



flag {

    name: "hsu_behavior_changes"

    name: "hsu_qs_changes"

    namespace: "systemui"

    description: "Overall changes on Sytem UI when current user is the Headless System User"

    description: "Overall changes on QuickSettings when current user is the Headless System User"

    bug: "408066623"

}

packages/SystemUI/multivalentTests/src/com/android/systemui/qs/panels/ui/viewmodel/EditModeButtonViewModelTest.kt

+4 −4
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ class EditModeButtonViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_HSU_BEHAVIOR_CHANGES)

    @DisableFlags(Flags.FLAG_HSU_QS_CHANGES)

    fun isEditButtonVisibleTrue_nonHsu_flagDisabled() =

        kosmos.runTest {

            val underTest = createEditModeButtonViewModel(false)
@@ -98,7 +98,7 @@ class EditModeButtonViewModelTest : SysuiTestCase() { 
        }



    @Test

    @DisableFlags(Flags.FLAG_HSU_BEHAVIOR_CHANGES)

    @DisableFlags(Flags.FLAG_HSU_QS_CHANGES)

    fun isEditButtonVisibleTrue_hsu_flagDisabled() =

        kosmos.runTest {

            val underTest = createEditModeButtonViewModel(true)
@@ -107,7 +107,7 @@ class EditModeButtonViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(Flags.FLAG_HSU_BEHAVIOR_CHANGES)

    @EnableFlags(Flags.FLAG_HSU_QS_CHANGES)

    fun isEditButtonVisibleTrue_nonHsu_flagEnabled() =

        kosmos.runTest {

            val underTest = createEditModeButtonViewModel(false)
@@ -116,7 +116,7 @@ class EditModeButtonViewModelTest : SysuiTestCase() { 
        }



    @Test

    @EnableFlags(Flags.FLAG_HSU_BEHAVIOR_CHANGES)

    @EnableFlags(Flags.FLAG_HSU_QS_CHANGES)

    fun isEditButtonVisibleFalse_hsu_flagEnabled() =

        kosmos.runTest {

            val underTest = createEditModeButtonViewModel(true)

packages/SystemUI/src/com/android/systemui/qs/panels/ui/viewmodel/toolbar/EditModeButtonViewModel.kt

+2 −2
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package com.android.systemui.qs.panels.ui.viewmodel.toolbar 


import android.app.ActivityManager

import androidx.compose.runtime.getValue

import com.android.systemui.Flags.hsuBehaviorChanges

import com.android.systemui.Flags.hsuQsChanges

import com.android.systemui.classifier.domain.interactor.FalsingInteractor

import com.android.systemui.lifecycle.ExclusiveActivatable

import com.android.systemui.lifecycle.Hydrator
@@ -62,7 +62,7 @@ constructor( 
            initialValue = false,

            source =

                selectedUserInteractor.selectedUser.map { selectedUserId ->

                    !hsuBehaviorChanges() || !hsum.isHeadlessSystemUser(selectedUserId)

                    !hsuQsChanges() || !hsum.isHeadlessSystemUser(selectedUserId)

                },

        )