Merge "Enable ThemeOverlayController on TV" into tm-dev am: 0989dd9c6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17075606 Change-Id: I9f3543f7a8f03c0b5caf6223a26e6d13a2fc3507 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -32,6 +32,7 @@ import com.android.systemui.statusbar.tv.TvStatusBar
|
|||||||
import com.android.systemui.statusbar.tv.VpnStatusObserver
|
import com.android.systemui.statusbar.tv.VpnStatusObserver
|
||||||
import com.android.systemui.statusbar.tv.notifications.TvNotificationHandler
|
import com.android.systemui.statusbar.tv.notifications.TvNotificationHandler
|
||||||
import com.android.systemui.statusbar.tv.notifications.TvNotificationPanel
|
import com.android.systemui.statusbar.tv.notifications.TvNotificationPanel
|
||||||
|
import com.android.systemui.theme.ThemeOverlayController
|
||||||
import com.android.systemui.toast.ToastUI
|
import com.android.systemui.toast.ToastUI
|
||||||
import com.android.systemui.usb.StorageNotification
|
import com.android.systemui.usb.StorageNotification
|
||||||
import com.android.systemui.util.NotificationChannels
|
import com.android.systemui.util.NotificationChannels
|
||||||
@@ -108,6 +109,12 @@ abstract class TVSystemUICoreStartableModule {
|
|||||||
@ClassKey(StorageNotification::class)
|
@ClassKey(StorageNotification::class)
|
||||||
abstract fun bindStorageNotification(sysui: StorageNotification): CoreStartable
|
abstract fun bindStorageNotification(sysui: StorageNotification): CoreStartable
|
||||||
|
|
||||||
|
/** Inject into ThemeOverlayController. */
|
||||||
|
@Binds
|
||||||
|
@IntoMap
|
||||||
|
@ClassKey(ThemeOverlayController::class)
|
||||||
|
abstract fun bindThemeOverlayController(sysui: ThemeOverlayController): CoreStartable
|
||||||
|
|
||||||
/** Inject into ToastUI. */
|
/** Inject into ToastUI. */
|
||||||
@Binds
|
@Binds
|
||||||
@IntoMap
|
@IntoMap
|
||||||
@@ -161,4 +168,4 @@ abstract class TVSystemUICoreStartableModule {
|
|||||||
@IntoMap
|
@IntoMap
|
||||||
@ClassKey(WMShell::class)
|
@ClassKey(WMShell::class)
|
||||||
abstract fun bindWMShell(sysui: WMShell): CoreStartable
|
abstract fun bindWMShell(sysui: WMShell): CoreStartable
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user