From a1298e78aaf87c0184626644a3aced9de2e5653d Mon Sep 17 00:00:00 2001 From: Matt Casey Date: Fri, 27 Dec 2024 14:39:05 +0000 Subject: Move screenshot_context_url to sysui shared flags Bug: 242791070 Flag: com.android.systemui.shared.screenshot_context_url Test: Build/presubmit Change-Id: I38f52aabcd6dfc9e69bc0f9226df16e5c7829487 --- packages/SystemUI/aconfig/systemui.aconfig | 7 ------- .../systemui/screenshot/DefaultScreenshotActionsProviderTest.kt | 2 +- .../com/android/systemui/screenshot/ScreenshotActionsProvider.kt | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) (limited to 'packages') diff --git a/packages/SystemUI/aconfig/systemui.aconfig b/packages/SystemUI/aconfig/systemui.aconfig index 87fb58ee359e..a93e4a08331c 100644 --- a/packages/SystemUI/aconfig/systemui.aconfig +++ b/packages/SystemUI/aconfig/systemui.aconfig @@ -752,13 +752,6 @@ flag { bug: "365597999" } -flag { - name: "screenshot_context_url" - namespace: "systemui" - description: "Include optional app-provided context URL when sharing a screenshot." - bug: "242791070" -} - flag { name: "run_fingerprint_detect_on_dismissible_keyguard" namespace: "systemui" diff --git a/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/DefaultScreenshotActionsProviderTest.kt b/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/DefaultScreenshotActionsProviderTest.kt index ba6518f9bd2b..cd30eddb1901 100644 --- a/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/DefaultScreenshotActionsProviderTest.kt +++ b/packages/SystemUI/multivalentTests/src/com/android/systemui/screenshot/DefaultScreenshotActionsProviderTest.kt @@ -24,9 +24,9 @@ import android.os.UserHandle import android.platform.test.annotations.EnableFlags import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.internal.logging.UiEventLogger -import com.android.systemui.Flags import com.android.systemui.SysuiTestCase import com.android.systemui.screenshot.ui.viewmodel.PreviewAction +import com.android.systemui.shared.Flags import com.google.common.truth.Truth.assertThat import java.util.UUID import kotlin.test.Test diff --git a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt index 1c232e9ddced..3696b133000c 100644 --- a/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt +++ b/packages/SystemUI/src/com/android/systemui/screenshot/ScreenshotActionsProvider.kt @@ -22,7 +22,6 @@ import android.net.Uri import android.util.Log import androidx.appcompat.content.res.AppCompatResources import com.android.internal.logging.UiEventLogger -import com.android.systemui.Flags.screenshotContextUrl import com.android.systemui.log.DebugLogger.debugLog import com.android.systemui.res.R import com.android.systemui.screenshot.ActionIntentCreator.createEdit @@ -33,6 +32,7 @@ import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_PREVIEW_TAPPED import com.android.systemui.screenshot.ScreenshotEvent.SCREENSHOT_SHARE_TAPPED import com.android.systemui.screenshot.ui.viewmodel.ActionButtonAppearance import com.android.systemui.screenshot.ui.viewmodel.PreviewAction +import com.android.systemui.shared.Flags.screenshotContextUrl import dagger.assisted.Assisted import dagger.assisted.AssistedFactory import dagger.assisted.AssistedInject -- cgit v1.2.3-59-g8ed1b