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

Commit fe25917f authored by Ale Nijamkin's avatar Ale Nijamkin Committed by Android (Google) Code Review
Browse files

Merge "[flexiglass] Deletes two unused flags." into main

parents 9e6d3e31 61500d56

packages/SystemUI/aconfig/systemui.aconfig

+0 −14
Original line number Diff line number Diff line
@@ -25,13 +25,6 @@ flag { 
   }

}



flag {

   name: "refactor_keyguard_dismiss_intent"

   namespace: "systemui"

   description: "Update how keyguard dismiss intents are stored."

   bug: "275069969"

}



flag {



    name: "notification_heads_up_cycling"
@@ -371,13 +364,6 @@ flag { 
    bug: "310005730"

}



flag {

   name: "media_in_scene_container"

   namespace: "systemui"

   description: "Enable media in the scene container framework"

   bug: "296122467"

}



flag {

   name: "pss_task_switcher"

   namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/keyguard/KeyguardSecurityContainerControllerTest.kt

+0 −1
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ class KeyguardSecurityContainerControllerTest : SysuiTestCase() { 
        if (!SceneContainerFlag.isEnabled) {

            mSetFlagsRule.disableFlags(

                AConfigFlags.FLAG_KEYGUARD_WM_STATE_REFACTOR,

                AConfigFlags.FLAG_REFACTOR_KEYGUARD_DISMISS_INTENT,

            )

        }

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

+0 −6
Original line number Diff line number Diff line
@@ -36,7 +36,6 @@ import com.google.common.truth.Truth.assertThat 
import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith
@@ -54,11 +53,6 @@ class AlternateBouncerToGoneTransitionViewModelTest : SysuiTestCase() { 
    private val sysuiStatusBarStateController = kosmos.sysuiStatusBarStateController

    private val underTest by lazy { kosmos.alternateBouncerToGoneTransitionViewModel }



    @Before

    fun setup() {

        mSetFlagsRule.disableFlags(com.android.systemui.Flags.FLAG_REFACTOR_KEYGUARD_DISMISS_INTENT)

    }



    @Test

    fun deviceEntryParentViewDisappear() =

        testScope.runTest {

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

+0 −6
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import com.android.systemui.testKosmos 
import com.google.common.truth.Truth.assertThat

import kotlinx.coroutines.ExperimentalCoroutinesApi

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith
@@ -48,11 +47,6 @@ class AlternateBouncerToPrimaryBouncerTransitionViewModelTest : SysuiTestCase() 
    private val keyguardTransitionRepository by lazy { kosmos.fakeKeyguardTransitionRepository }

    private val underTest by lazy { kosmos.alternateBouncerToPrimaryBouncerTransitionViewModel }



    @Before

    fun setup() {

        mSetFlagsRule.disableFlags(com.android.systemui.Flags.FLAG_REFACTOR_KEYGUARD_DISMISS_INTENT)

    }



    @Test

    fun deviceEntryParentViewDisappear() =

        testScope.runTest {

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

+0 −1
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ class BouncerToGoneFlowsTest : SysuiTestCase() { 
    @Before

    fun setUp() {

        MockitoAnnotations.initMocks(this)

        mSetFlagsRule.disableFlags(com.android.systemui.Flags.FLAG_REFACTOR_KEYGUARD_DISMISS_INTENT)

        whenever(primaryBouncerInteractor.willRunDismissFromKeyguard()).thenReturn(false)

        sysuiStatusBarStateController.setLeaveOpenOnKeyguardHide(false)

    }