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

Commit fc4963a6 authored by Caitlin Shkuratov's avatar Caitlin Shkuratov Committed by Android (Google) Code Review
Browse files

Merge "[CS] Move EmergencyGestureModule to top-level modules not CSModule." into main

parents 1943e8f2 a061bae4

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

+2 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.systemui.dock.DockManager; 
import com.android.systemui.dock.DockManagerImpl;

import com.android.systemui.doze.DozeHost;

import com.android.systemui.education.dagger.ContextualEducationModule;

import com.android.systemui.emergency.EmergencyGestureModule;

import com.android.systemui.inputdevice.tutorial.KeyboardTouchpadTutorialModule;

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

import com.android.systemui.keyguard.ui.composable.blueprint.DefaultBlueprintModule;
@@ -123,6 +124,7 @@ import javax.inject.Named; 
        CollapsedStatusBarFragmentStartableModule.class,

        ConnectingDisplayViewModel.StartableModule.class,

        DefaultBlueprintModule.class,

        EmergencyGestureModule.class,

        GestureModule.class,

        HeadsUpModule.class,

        KeyboardShortcutsModule.class,

packages/SystemUI/src/com/android/systemui/statusbar/dagger/CentralSurfacesModule.java

+1 −2
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.statusbar.dagger;



import com.android.systemui.dagger.SysUISingleton;

import com.android.systemui.emergency.EmergencyGestureModule;

import com.android.systemui.statusbar.notification.dagger.NotificationsModule;

import com.android.systemui.statusbar.notification.row.NotificationRowModule;

import com.android.systemui.statusbar.phone.CentralSurfaces;
@@ -32,7 +31,7 @@ import dagger.Module; 
 */

@Module(includes = {CentralSurfacesDependenciesModule.class,

        StatusBarNotificationPresenterModule.class,

        NotificationsModule.class, NotificationRowModule.class, EmergencyGestureModule.class})

        NotificationsModule.class, NotificationRowModule.class})

public interface CentralSurfacesModule {

    /**

     * Provides our instance of CentralSurfaces which is considered optional.