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

Commit 1a61272e authored by Chris Göllner's avatar Chris Göllner Committed by Automerger Merge Worker
Browse files

Merge changes Id1c3e56e,Id14bfaed,I3aae76de,I46ff1214,I58a7f648 into udc-qpr-dev am: 3400bb34 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23781543



Change-Id: I8897e5a1e280c7e3bd8e774bc6642b3fc7155afa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 85879b2d 3400bb34

packages/SystemUI/src/com/android/systemui/dagger/SystemUICoreStartableModule.kt

+9 −0
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ import com.android.systemui.media.dialog.MediaOutputSwitcherDialogUI 
import com.android.systemui.media.taptotransfer.MediaTttCommandLineHelper

import com.android.systemui.media.taptotransfer.receiver.MediaTttChipControllerReceiver

import com.android.systemui.media.taptotransfer.sender.MediaTttSenderCoordinator

import com.android.systemui.mediaprojection.taskswitcher.MediaProjectionTaskSwitcherCoreStartable

import com.android.systemui.power.PowerUI

import com.android.systemui.reardisplay.RearDisplayDialogController

import com.android.systemui.recents.Recents
@@ -111,6 +112,14 @@ abstract class SystemUICoreStartableModule { 
    @ClassKey(KeyboardUI::class)

    abstract fun bindKeyboardUI(sysui: KeyboardUI): CoreStartable



    /** Inject into MediaProjectionTaskSwitcherCoreStartable. */

    @Binds

    @IntoMap

    @ClassKey(MediaProjectionTaskSwitcherCoreStartable::class)

    abstract fun bindProjectedTaskListener(

            sysui: MediaProjectionTaskSwitcherCoreStartable

    ): CoreStartable



    /** Inject into KeyguardBiometricLockoutLogger */

    @Binds

    @IntoMap

packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java

+2 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ import com.android.systemui.log.dagger.LogModule; 
import com.android.systemui.log.dagger.MonitorLog;

import com.android.systemui.log.table.TableLogBuffer;

import com.android.systemui.mediaprojection.appselector.MediaProjectionModule;

import com.android.systemui.mediaprojection.taskswitcher.MediaProjectionTaskSwitcherModule;

import com.android.systemui.model.SysUiState;

import com.android.systemui.motiontool.MotionToolModule;

import com.android.systemui.navigationbar.NavigationBarComponent;
@@ -182,6 +183,7 @@ import javax.inject.Named; 
            LockscreenLayoutModule.class,

            LogModule.class,

            MediaProjectionModule.class,

            MediaProjectionTaskSwitcherModule.class,

            MotionToolModule.class,

            PeopleHubModule.class,

            PeopleModule.class,

packages/SystemUI/src/com/android/systemui/mediaprojection/taskswitcher/MediaProjectionTaskSwitcherCoreStartable.kt

0 → 100644
+39 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.mediaprojection.taskswitcher



import com.android.systemui.CoreStartable

import com.android.systemui.dagger.SysUISingleton

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.mediaprojection.taskswitcher.ui.TaskSwitcherNotificationCoordinator

import javax.inject.Inject



@SysUISingleton

class MediaProjectionTaskSwitcherCoreStartable

@Inject

constructor(

    private val notificationCoordinator: TaskSwitcherNotificationCoordinator,

    private val featureFlags: FeatureFlags,

) : CoreStartable {



    override fun start() {

        if (featureFlags.isEnabled(Flags.PARTIAL_SCREEN_SHARING_TASK_SWITCHER)) {

            notificationCoordinator.start()

        }

    }

}

packages/SystemUI/src/com/android/systemui/mediaprojection/taskswitcher/MediaProjectionTaskSwitcherModule.kt

0 → 100644
+32 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.mediaprojection.taskswitcher



import com.android.systemui.mediaprojection.taskswitcher.data.repository.ActivityTaskManagerTasksRepository

import com.android.systemui.mediaprojection.taskswitcher.data.repository.MediaProjectionManagerRepository

import com.android.systemui.mediaprojection.taskswitcher.data.repository.MediaProjectionRepository

import com.android.systemui.mediaprojection.taskswitcher.data.repository.TasksRepository

import dagger.Binds

import dagger.Module



@Module

interface MediaProjectionTaskSwitcherModule {



    @Binds fun mediaRepository(impl: MediaProjectionManagerRepository): MediaProjectionRepository



    @Binds fun tasksRepository(impl: ActivityTaskManagerTasksRepository): TasksRepository

}

packages/SystemUI/src/com/android/systemui/mediaprojection/taskswitcher/data/model/MediaProjectionState.kt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2023 The Android Open Source Project

 *

 * Licensed under the Apache License, Version 2.0 (the "License");

 * you may not use this file except in compliance with the License.

 * You may obtain a copy of the License at

 *

 *      http://www.apache.org/licenses/LICENSE-2.0

 *

 * Unless required by applicable law or agreed to in writing, software

 * distributed under the License is distributed on an "AS IS" BASIS,

 * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

 * See the License for the specific language governing permissions and

 * limitations under the License.

 */



package com.android.systemui.mediaprojection.taskswitcher.data.model



import android.app.TaskInfo



/** Represents the state of media projection. */

sealed interface MediaProjectionState {

    object NotProjecting : MediaProjectionState

    object EntireScreen : MediaProjectionState

    data class SingleTask(val task: TaskInfo) : MediaProjectionState

}