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

Commit a3eb4c65 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Convert extension functions to regular functions." into main am: 74cb5af8 

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



Change-Id: Idcccd8fdc0f7348df7784d7d4fafdbe1acb471fa
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 328b8763 74cb5af8

packages/SystemUI/src/com/android/systemui/notetask/NoteTaskModule.kt

+9 −7
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import android.app.Service 
import android.app.role.RoleManager

import com.android.systemui.flags.FeatureFlags

import com.android.systemui.flags.Flags

import com.android.systemui.notetask.NoteTaskBubblesController.NoteTaskBubblesService

import com.android.systemui.notetask.quickaffordance.NoteTaskQuickAffordanceModule

import com.android.systemui.notetask.shortcut.CreateNoteTaskShortcutActivity

import com.android.systemui.notetask.shortcut.LaunchNoteTaskActivity
@@ -37,20 +38,21 @@ import dagger.multibindings.IntoMap 
interface NoteTaskModule {



    @[Binds IntoMap ClassKey(NoteTaskControllerUpdateService::class)]

    fun NoteTaskControllerUpdateService.bindNoteTaskControllerUpdateService(): Service

    fun bindNoteTaskControllerUpdateService(service: NoteTaskControllerUpdateService): Service



    @[Binds IntoMap ClassKey(NoteTaskBubblesController.NoteTaskBubblesService::class)]

    fun NoteTaskBubblesController.NoteTaskBubblesService.bindNoteTaskBubblesService(): Service

    @[Binds IntoMap ClassKey(NoteTaskBubblesService::class)]

    fun bindNoteTaskBubblesService(service: NoteTaskBubblesService): Service



    @[Binds IntoMap ClassKey(LaunchNoteTaskActivity::class)]

    fun LaunchNoteTaskActivity.bindNoteTaskLauncherActivity(): Activity

    fun bindNoteTaskLauncherActivity(activity: LaunchNoteTaskActivity): Activity



    @[Binds IntoMap ClassKey(LaunchNotesRoleSettingsTrampolineActivity::class)]

    fun LaunchNotesRoleSettingsTrampolineActivity.bindLaunchNotesRoleSettingsTrampolineActivity():

        Activity

    fun bindLaunchNotesRoleSettingsTrampolineActivity(

        activity: LaunchNotesRoleSettingsTrampolineActivity

    ): Activity



    @[Binds IntoMap ClassKey(CreateNoteTaskShortcutActivity::class)]

    fun CreateNoteTaskShortcutActivity.bindNoteTaskShortcutActivity(): Activity

    fun bindNoteTaskShortcutActivity(activity: CreateNoteTaskShortcutActivity): Activity



    companion object {

packages/SystemUI/src/com/android/systemui/notetask/quickaffordance/NoteTaskQuickAffordanceModule.kt

+3 −1
Original line number Diff line number Diff line
@@ -25,5 +25,7 @@ import dagger.multibindings.IntoSet 
interface NoteTaskQuickAffordanceModule {



    @[Binds IntoSet]

    fun NoteTaskQuickAffordanceConfig.bindNoteTaskQuickAffordance(): KeyguardQuickAffordanceConfig

    fun bindNoteTaskQuickAffordance(

        impl: NoteTaskQuickAffordanceConfig

    ): KeyguardQuickAffordanceConfig

}