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

Commit 44217582 authored by Dave Mankoff's avatar Dave Mankoff Committed by Android (Google) Code Review
Browse files

Merge changes from topic "b229228871-cs-interface" into tm-dev 

* changes:
  Rename CentralSurfacesInt back to CentralSurfaces.
  Make CentralSurfaces an Interface.
parents 38b22faf e8c887c8

packages/SystemUI/src/com/android/systemui/statusbar/CommandQueue.java

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ import static android.inputmethodservice.InputMethodService.IME_INVISIBLE; 
import static android.view.Display.DEFAULT_DISPLAY;

import static android.view.Display.INVALID_DISPLAY;



import static com.android.systemui.statusbar.phone.CentralSurfaces.ONLY_CORE_APPS;

import static com.android.systemui.statusbar.phone.CentralSurfacesImpl.ONLY_CORE_APPS;



import android.annotation.Nullable;

import android.app.ITransientNotificationCallback;

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

+2 −1
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ import com.android.systemui.statusbar.notification.collection.legacy.VisualStabi 
import com.android.systemui.statusbar.notification.collection.notifcollection.CommonNotifCollection;

import com.android.systemui.statusbar.notification.collection.render.NotificationVisibilityProvider;

import com.android.systemui.statusbar.phone.CentralSurfaces;

import com.android.systemui.statusbar.phone.CentralSurfacesImpl;

import com.android.systemui.statusbar.phone.KeyguardBypassController;

import com.android.systemui.statusbar.phone.ManagedProfileController;

import com.android.systemui.statusbar.phone.ManagedProfileControllerImpl;
@@ -87,7 +88,7 @@ import dagger.Module; 
import dagger.Provides;



/**

 * This module provides instances needed to construct {@link CentralSurfaces}. These are moved to

 * This module provides instances needed to construct {@link CentralSurfacesImpl}. These are moved to

 * this separate from {@link CentralSurfacesModule} module so that components that wish to build

 * their own version of CentralSurfaces can include just dependencies, without injecting

 * CentralSurfaces itself.

packages/SystemUI/src/com/android/systemui/statusbar/dagger/StartCentralSurfacesModule.kt

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


import com.android.systemui.CoreStartable

import com.android.systemui.statusbar.phone.CentralSurfaces

import com.android.systemui.statusbar.phone.CentralSurfacesImpl

import dagger.Binds

import dagger.Module

import dagger.multibindings.ClassKey
@@ -29,5 +30,5 @@ interface StartCentralSurfacesModule { 
    @Binds

    @IntoMap

    @ClassKey(CentralSurfaces::class)

    abstract fun bindsCentralSurfaces(centralSurfaces: CentralSurfaces): CoreStartable

    abstract fun bindsCentralSurfaces(centralSurfaces: CentralSurfacesImpl): CoreStartable

}