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

Commit b6778b2e authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "ShortcutHelper v2: include feature in same dagger modules as v1" into main

parents 8e70f262 9db3658a

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

+3 −1
Original line number Original line Diff line number Diff line
@@ -31,6 +31,7 @@ import com.android.systemui.display.ui.viewmodel.ConnectingDisplayViewModel; 
import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManager;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.doze.DozeHost;

import com.android.systemui.doze.DozeHost;

import com.android.systemui.keyboard.shortcut.ShortcutHelperModule;

import com.android.systemui.keyguard.ui.composable.blueprint.DefaultBlueprintModule;

import com.android.systemui.keyguard.ui.composable.blueprint.DefaultBlueprintModule;

import com.android.systemui.keyguard.ui.view.layout.blueprints.KeyguardBlueprintModule;

import com.android.systemui.keyguard.ui.view.layout.blueprints.KeyguardBlueprintModule;

import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSectionsModule;

import com.android.systemui.keyguard.ui.view.layout.sections.KeyguardSectionsModule;
@@ -137,7 +138,8 @@ import javax.inject.Named; 
        UnfoldTransitionModule.Startables.class,

        UnfoldTransitionModule.Startables.class,

        ToastModule.class,

        ToastModule.class,

        VolumeModule.class,

        VolumeModule.class,

        WallpaperModule.class

        WallpaperModule.class,

        ShortcutHelperModule.class,

})

})

public abstract class ReferenceSystemUIModule {

public abstract class ReferenceSystemUIModule {

packages/SystemUI/src/com/android/systemui/keyboard/KeyboardModule.kt

+1 −2
Original line number Original line Diff line number Diff line
@@ -19,13 +19,12 @@ package com.android.systemui.keyboard 




import com.android.systemui.keyboard.data.repository.KeyboardRepository

import com.android.systemui.keyboard.data.repository.KeyboardRepository

import com.android.systemui.keyboard.data.repository.KeyboardRepositoryImpl

import com.android.systemui.keyboard.data.repository.KeyboardRepositoryImpl

import com.android.systemui.keyboard.shortcut.ShortcutHelperModule

import com.android.systemui.keyboard.stickykeys.data.repository.StickyKeysRepository

import com.android.systemui.keyboard.stickykeys.data.repository.StickyKeysRepository

import com.android.systemui.keyboard.stickykeys.data.repository.StickyKeysRepositoryImpl

import com.android.systemui.keyboard.stickykeys.data.repository.StickyKeysRepositoryImpl

import dagger.Binds

import dagger.Binds

import dagger.Module

import dagger.Module





@Module(includes = [ShortcutHelperModule::class])

@Module

abstract class KeyboardModule {

abstract class KeyboardModule {





    @Binds

    @Binds