Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Deprecate setIsDreaming in favor of setUiSurface." into tm-qpr-dev am: e4529489c6

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/21423772

Change-Id: I7dc1f38a4d6ddeee6434c95c1acbbaafaefdf7e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Xiaowen Lei
2023-02-16 01:30:07 +00:00
committed by Automerger Merge Worker
parent df93ebe8ed e4529489c6
commit 0d11e6f879
4 changed files with 2 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java
View File

@@ -117,12 +117,6 @@ public interface BcSmartspaceDataPlugin extends Plugin {
*/ */
void setPrimaryTextColor(int color); void setPrimaryTextColor(int color);
/**
* When the view is displayed on Dream, set the flag to true, immediately after the view is
* created.
*/
void setIsDreaming(boolean isDreaming);
/** /**
* Set the UI surface for the cards. Should be called immediately after the view is created. * Set the UI surface for the cards. Should be called immediately after the view is created.
*/ */

3
packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt
View File

@@ -21,6 +21,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import com.android.systemui.plugins.ActivityStarter import com.android.systemui.plugins.ActivityStarter
import com.android.systemui.plugins.BcSmartspaceDataPlugin import com.android.systemui.plugins.BcSmartspaceDataPlugin
import com.android.systemui.plugins.BcSmartspaceDataPlugin.UI_SURFACE_DREAM
import com.android.systemui.plugins.FalsingManager import com.android.systemui.plugins.FalsingManager
import com.android.systemui.smartspace.dagger.SmartspaceViewComponent.SmartspaceViewModule.PLUGIN import com.android.systemui.smartspace.dagger.SmartspaceViewComponent.SmartspaceViewModule.PLUGIN
import dagger.BindsInstance import dagger.BindsInstance
@@ -57,7 +58,7 @@ interface SmartspaceViewComponent {
BcSmartspaceDataPlugin.SmartspaceView { BcSmartspaceDataPlugin.SmartspaceView {
val ssView = plugin.getView(parent) val ssView = plugin.getView(parent)
// Currently, this is only used to provide SmartspaceView on Dream surface. // Currently, this is only used to provide SmartspaceView on Dream surface.
ssView.setIsDreaming(true) ssView.setUiSurface(UI_SURFACE_DREAM)
ssView.registerDataProvider(plugin) ssView.registerDataProvider(plugin)
ssView.setIntentStarter(object : BcSmartspaceDataPlugin.IntentStarter { ssView.setIntentStarter(object : BcSmartspaceDataPlugin.IntentStarter {

2
packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt
View File

@@ -99,8 +99,6 @@ class DreamSmartspaceControllerTest : SysuiTestCase() {
override fun setPrimaryTextColor(color: Int) {} override fun setPrimaryTextColor(color: Int) {}
override fun setIsDreaming(isDreaming: Boolean) {}
override fun setUiSurface(uiSurface: String) {} override fun setUiSurface(uiSurface: String) {}
override fun setDozeAmount(amount: Float) {} override fun setDozeAmount(amount: Float) {}

9
packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt
View File

@@ -780,9 +780,6 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() {
override fun setPrimaryTextColor(color: Int) { override fun setPrimaryTextColor(color: Int) {
} }
override fun setIsDreaming(isDreaming: Boolean) {
}
override fun setUiSurface(uiSurface: String) { override fun setUiSurface(uiSurface: String) {
} }
@@ -811,9 +808,6 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() {
override fun setPrimaryTextColor(color: Int) { override fun setPrimaryTextColor(color: Int) {
} }
override fun setIsDreaming(isDreaming: Boolean) {
}
override fun setUiSurface(uiSurface: String) { override fun setUiSurface(uiSurface: String) {
} }
@@ -838,9 +832,6 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() {
override fun setPrimaryTextColor(color: Int) { override fun setPrimaryTextColor(color: Int) {
} }
override fun setIsDreaming(isDreaming: Boolean) {
}
override fun setUiSurface(uiSurface: String) { override fun setUiSurface(uiSurface: String) {
} }