Merge "Move ViewCapture On/Off controls to QuickSettings Tile." into tm-qpr-dev am: 27f5768520
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/20946625 Change-Id: I730c8bfe5e64a5c0226f2696e7d431b20e9b9658 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -19,7 +19,6 @@ package com.android.systemui.motiontool
|
|||||||
import android.view.WindowManagerGlobal
|
import android.view.WindowManagerGlobal
|
||||||
import com.android.app.motiontool.DdmHandleMotionTool
|
import com.android.app.motiontool.DdmHandleMotionTool
|
||||||
import com.android.app.motiontool.MotionToolManager
|
import com.android.app.motiontool.MotionToolManager
|
||||||
import com.android.app.viewcapture.ViewCapture
|
|
||||||
import com.android.systemui.CoreStartable
|
import com.android.systemui.CoreStartable
|
||||||
import dagger.Binds
|
import dagger.Binds
|
||||||
import dagger.Module
|
import dagger.Module
|
||||||
@@ -38,17 +37,12 @@ interface MotionToolModule {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
fun provideMotionToolManager(
|
fun provideMotionToolManager(windowManagerGlobal: WindowManagerGlobal): MotionToolManager {
|
||||||
viewCapture: ViewCapture,
|
return MotionToolManager.getInstance(windowManagerGlobal)
|
||||||
windowManagerGlobal: WindowManagerGlobal
|
|
||||||
): MotionToolManager {
|
|
||||||
return MotionToolManager.getInstance(viewCapture, windowManagerGlobal)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Provides
|
@Provides
|
||||||
fun provideWindowManagerGlobal(): WindowManagerGlobal = WindowManagerGlobal.getInstance()
|
fun provideWindowManagerGlobal(): WindowManagerGlobal = WindowManagerGlobal.getInstance()
|
||||||
|
|
||||||
@Provides fun provideViewCapture(): ViewCapture = ViewCapture.getInstance()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@Binds
|
@Binds
|
||||||
|
|||||||
Reference in New Issue
Block a user