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

Commit 586a4906 authored by Miranda Kephart's avatar Miranda Kephart
Browse files

Clean up screenshot_action_dismiss_system_windows flags 

Bug: 309933761
Test: manual
Flag: EXEMPT removing rolled out/obsolete flags
Change-Id: I5006a15da2452cfbab5b6c519c28b202ba9f0ba1
parent dc5fa92e

packages/SystemUI/aconfig/systemui.aconfig

+0 −17
Original line number Diff line number Diff line
@@ -757,23 +757,6 @@ flag { 
    }

}



flag {

    name: "screenshot_action_dismiss_system_windows"

    namespace: "systemui"

    description: "Dismiss existing system windows when starting action from screenshot UI"

    bug: "309933761"

}



flag {

    name: "fix_screenshot_action_dismiss_system_windows"

    namespace: "systemui"

    description: "Dismiss existing system windows when starting action from screenshot UI"

    bug: "309933761"

    metadata {

        purpose: PURPOSE_BUGFIX

    }

}



flag {

    name: "screenshot_scroll_crop_view_crash_fix"

    namespace: "systemui"

packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/ActionIntentExecutorTest.kt

+0 −3
Original line number Diff line number Diff line
@@ -19,9 +19,7 @@ package com.android.systemui.screenshot 
import android.content.Context

import android.content.Intent

import android.os.Process.myUserHandle

import android.platform.test.annotations.EnableFlags

import androidx.test.ext.junit.runners.AndroidJUnit4

import com.android.systemui.Flags

import com.android.systemui.SysuiTestCase

import com.android.systemui.screenshot.proxy.ScreenshotProxy

import com.android.systemui.settings.DisplayTracker
@@ -60,7 +58,6 @@ class ActionIntentExecutorTest : SysuiTestCase() { 
        )



    @Test

    @EnableFlags(Flags.FLAG_FIX_SCREENSHOT_ACTION_DISMISS_SYSTEM_WINDOWS)

    fun launchIntent_callsCloseSystemWindows() =

        testScope.runTest {

            val intent = Intent(Intent.ACTION_EDIT).apply { flags = Intent.FLAG_ACTIVITY_NEW_TASK }

packages/SystemUI/src/com/android/systemui/screenshot/ActionIntentExecutor.kt

+1 −6
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ import android.view.WindowManager 
import android.view.WindowManagerGlobal

import com.android.app.tracing.coroutines.launchTraced as launch

import com.android.internal.infra.ServiceConnector

import com.android.systemui.Flags

import com.android.systemui.dagger.SysUISingleton

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

import com.android.systemui.dagger.qualifiers.Main
@@ -84,11 +83,7 @@ constructor( 
        options: ActivityOptions?,

        transitionCoordinator: ExitTransitionCoordinator?,

    ) {

        if (Flags.fixScreenshotActionDismissSystemWindows()) {

            activityManagerWrapper.closeSystemWindows(

                CentralSurfaces.SYSTEM_DIALOG_REASON_SCREENSHOT

            )

        }

        activityManagerWrapper.closeSystemWindows(CentralSurfaces.SYSTEM_DIALOG_REASON_SCREENSHOT)

        screenshotProxy.dismissKeyguard()

        var transitionOptions: ActivityOptions? = null

        if (transitionCoordinator?.decor?.isAttachedToWindow == true) {