Merge "Revert "Move MediaProjection classes into more specific package"" into main (d0ade531) · Commits · e / os / android_frameworks_base

core/res/res/values/config.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -4830,7 +4830,7 @@
		<string translatable="false" name="config_deviceSpecificInputMethodManagerService"></string>

		<!-- Component name of media projection permission dialog -->
		<string name="config_mediaProjectionPermissionDialogComponent" translatable="false">com.android.systemui/com.android.systemui.mediaprojection.MediaProjectionPermissionActivity</string>
		<string name="config_mediaProjectionPermissionDialogComponent" translatable="false">com.android.systemui/com.android.systemui.media.MediaProjectionPermissionActivity</string>

		<!-- Corner radius of system dialogs -->
		<dimen name="config_dialogCornerRadius">28dp</dimen>

packages/SystemUI/AndroidManifest.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -634,7 +634,7 @@

		<!-- started from MediaProjectionManager -->
		<activity
		android:name=".mediaprojection.permission.MediaProjectionPermissionActivity"
		android:name=".media.MediaProjectionPermissionActivity"
		android:exported="true"
		android:theme="@style/Theme.SystemUI.MediaProjectionAlertDialog"
		android:finishOnCloseSystemDialogs="true"
		@@ -643,7 +643,7 @@
		android:visibleToInstantApps="true"/>

		<activity
		android:name=".mediaprojection.appselector.MediaProjectionAppSelectorActivity"
		android:name=".media.MediaProjectionAppSelectorActivity"
		android:theme="@style/Theme.SystemUI.MediaProjectionAppSelector"
		android:finishOnCloseSystemDialogs="true"
		android:excludeFromRecents="true"

packages/SystemUI/src/com/android/systemui/mediaprojection/appselector/MediaProjectionAppSelectorActivity.kt→packages/SystemUI/src/com/android/systemui/media/MediaProjectionAppSelectorActivity.kt

+6 −4

Original line number	Diff line number	Diff line
		@@ -13,7 +13,7 @@
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/
		package com.android.systemui.mediaprojection.appselector
		package com.android.systemui.media

		import android.app.ActivityOptions
		import android.content.Intent
		@@ -46,11 +46,13 @@ import com.android.internal.app.chooser.TargetInfo
		import com.android.internal.widget.RecyclerView
		import com.android.internal.widget.RecyclerViewAccessibilityDelegate
		import com.android.internal.widget.ResolverDrawerLayout
		import com.android.systemui.mediaprojection.MediaProjectionCaptureTarget
		import com.android.systemui.mediaprojection.MediaProjectionServiceHelper
		import com.android.systemui.res.R
		import com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorComponent
		import com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorController
		import com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorResultHandler
		import com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorView
		import com.android.systemui.mediaprojection.appselector.data.RecentTask
		import com.android.systemui.mediaprojection.appselector.view.MediaProjectionRecentsViewController
		import com.android.systemui.res.R
		import com.android.systemui.statusbar.policy.ConfigurationController
		import com.android.systemui.util.AsyncActivityLauncher
		import javax.inject.Inject

packages/SystemUI/src/com/android/systemui/mediaprojection/MediaProjectionCaptureTarget.kt→packages/SystemUI/src/com/android/systemui/media/MediaProjectionCaptureTarget.kt

+7 −4

Original line number	Diff line number	Diff line
		@@ -14,17 +14,20 @@
		* limitations under the License.
		*/

		package com.android.systemui.mediaprojection
		package com.android.systemui.media

		import android.os.IBinder
		import android.os.Parcel
		import android.os.Parcelable

		/**
		* Class that represents an area that should be captured. Currently it has only a launch cookie that
		* represents a task but we potentially could add more identifiers e.g. for a pair of tasks.
		* Class that represents an area that should be captured.
		* Currently it has only a launch cookie that represents a task but
		* we potentially could add more identifiers e.g. for a pair of tasks.
		*/
		data class MediaProjectionCaptureTarget(val launchCookie: IBinder?) : Parcelable {
		data class MediaProjectionCaptureTarget(
		val launchCookie: IBinder?
		): Parcelable {

		constructor(parcel: Parcel) : this(parcel.readStrongBinder())

packages/SystemUI/src/com/android/systemui/mediaprojection/permission/MediaProjectionPermissionActivity.java→packages/SystemUI/src/com/android/systemui/media/MediaProjectionPermissionActivity.java

+6 −6

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package com.android.systemui.mediaprojection.permission;
		package com.android.systemui.media;

		import static android.media.projection.IMediaProjectionManager.EXTRA_PACKAGE_REUSING_GRANTED_CONSENT;
		import static android.media.projection.IMediaProjectionManager.EXTRA_USER_REVIEW_GRANTED_CONSENT;
		@@ -22,8 +22,8 @@ import static android.media.projection.ReviewGrantedConsentResult.RECORD_CANCEL;
		import static android.media.projection.ReviewGrantedConsentResult.RECORD_CONTENT_DISPLAY;
		import static android.view.WindowManager.LayoutParams.SYSTEM_FLAG_HIDE_NON_SYSTEM_OVERLAY_WINDOWS;

		import static com.android.systemui.mediaprojection.permission.ScreenShareOptionKt.ENTIRE_SCREEN;
		import static com.android.systemui.mediaprojection.permission.ScreenShareOptionKt.SINGLE_APP;
		import static com.android.systemui.screenrecord.ScreenShareOptionKt.ENTIRE_SCREEN;
		import static com.android.systemui.screenrecord.ScreenShareOptionKt.SINGLE_APP;

		import android.annotation.Nullable;
		import android.app.Activity;
		@@ -51,13 +51,13 @@ import android.text.style.StyleSpan;
		import android.util.Log;
		import android.view.Window;

		import com.android.systemui.res.R;
		import com.android.systemui.flags.FeatureFlags;
		import com.android.systemui.flags.Flags;
		import com.android.systemui.mediaprojection.MediaProjectionServiceHelper;
		import com.android.systemui.mediaprojection.appselector.MediaProjectionAppSelectorActivity;
		import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDevicePolicyResolver;
		import com.android.systemui.mediaprojection.devicepolicy.ScreenCaptureDisabledDialog;
		import com.android.systemui.res.R;
		import com.android.systemui.screenrecord.MediaProjectionPermissionDialog;
		import com.android.systemui.screenrecord.ScreenShareOption;
		import com.android.systemui.statusbar.phone.SystemUIDialog;
		import com.android.systemui.util.Utils;