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

Commit 6d8ad4db authored by Matt Casey's avatar Matt Casey Committed by Android (Google) Code Review
Browse files

Merge "Move screenshot_context_url to sysui shared flags" into main

parents b9ca0695 a1298e78

packages/SystemUI/aconfig/systemui.aconfig

+0 −7
Original line number Diff line number Diff line
@@ -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"

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

+1 −1
Original line number Diff line number Diff line
@@ -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

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

+1 −1
Original line number Diff line number Diff line
@@ -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