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

Commit 9118f780 authored by Sam Cackett's avatar Sam Cackett Committed by Android (Google) Code Review
Browse files

Merge "Revert "Revert "Move MediaProjection classes into more specific ..."" into main

parents 2934897e cee4a09d

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.media.MediaProjectionPermissionActivity</string>

    <string name="config_mediaProjectionPermissionDialogComponent" translatable="false">com.android.systemui/com.android.systemui.mediaprojection.permission.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=".media.MediaProjectionPermissionActivity"

            android:name=".mediaprojection.permission.MediaProjectionPermissionActivity"

            android:exported="true"

            android:theme="@style/Theme.SystemUI.MediaProjectionAlertDialog"

            android:finishOnCloseSystemDialogs="true"
@@ -643,7 +643,7 @@ 
            android:visibleToInstantApps="true"/>



        <activity

            android:name=".media.MediaProjectionAppSelectorActivity"

            android:name=".mediaprojection.appselector.MediaProjectionAppSelectorActivity"

            android:theme="@style/Theme.SystemUI.MediaProjectionAppSelector"

            android:finishOnCloseSystemDialogs="true"

            android:excludeFromRecents="true"

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

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

 */



package com.android.systemui.media

package com.android.systemui.mediaprojection



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/media/MediaProjectionServiceHelper.kt→packages/SystemUI/src/com/android/systemui/mediaprojection/MediaProjectionServiceHelper.kt

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

 */



package com.android.systemui.media

package com.android.systemui.mediaprojection



import android.content.Context

import android.media.projection.IMediaProjection

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

+4 −6
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.media

package com.android.systemui.mediaprojection.appselector



import android.app.ActivityOptions

import android.content.Intent
@@ -46,13 +46,11 @@ 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.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.MediaProjectionCaptureTarget

import com.android.systemui.mediaprojection.MediaProjectionServiceHelper

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