From 83339155a960be8641862f53b813f153bc6f9904 Mon Sep 17 00:00:00 2001 From: Xiaowen Lei Date: Thu, 2 Feb 2023 20:21:26 -0800 Subject: [PATCH] Deprecate `setIsDreaming` in favor of `setUiSurface`. Bug: 266139726 Test: manual Test: DreamSmartspaceControllerTest Test: LockscreenSmartspaceControllerTest Change-Id: I35e2b0a1d8b3f203371dfb23b9a3c0d7590ce4d5 --- .../android/systemui/plugins/BcSmartspaceDataPlugin.java | 6 ------ .../smartspace/dagger/SmartspaceViewComponent.kt | 3 ++- .../systemui/smartspace/DreamSmartspaceControllerTest.kt | 2 -- .../lockscreen/LockscreenSmartspaceControllerTest.kt | 9 --------- 4 files changed, 2 insertions(+), 18 deletions(-) diff --git a/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java b/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java index e0cc8f4a7596e..e0d01845562f4 100644 --- a/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java +++ b/packages/SystemUI/plugin/bcsmartspace/src/com/android/systemui/plugins/BcSmartspaceDataPlugin.java @@ -117,12 +117,6 @@ public interface BcSmartspaceDataPlugin extends Plugin { */ 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. */ diff --git a/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt b/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt index 236ba1f92d1f2..5736a5cdc05a3 100644 --- a/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt +++ b/packages/SystemUI/src/com/android/systemui/smartspace/dagger/SmartspaceViewComponent.kt @@ -21,6 +21,7 @@ import android.view.View import android.view.ViewGroup import com.android.systemui.plugins.ActivityStarter 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.smartspace.dagger.SmartspaceViewComponent.SmartspaceViewModule.PLUGIN import dagger.BindsInstance @@ -57,7 +58,7 @@ interface SmartspaceViewComponent { BcSmartspaceDataPlugin.SmartspaceView { val ssView = plugin.getView(parent) // Currently, this is only used to provide SmartspaceView on Dream surface. - ssView.setIsDreaming(true) + ssView.setUiSurface(UI_SURFACE_DREAM) ssView.registerDataProvider(plugin) ssView.setIntentStarter(object : BcSmartspaceDataPlugin.IntentStarter { diff --git a/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt index c5432c5fe330d..a280510009a7d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt @@ -99,8 +99,6 @@ class DreamSmartspaceControllerTest : SysuiTestCase() { override fun setPrimaryTextColor(color: Int) {} - override fun setIsDreaming(isDreaming: Boolean) {} - override fun setUiSurface(uiSurface: String) {} override fun setDozeAmount(amount: Float) {} diff --git a/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt index d6225c6748f3e..7fdcfb210804b 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/statusbar/lockscreen/LockscreenSmartspaceControllerTest.kt @@ -780,9 +780,6 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { override fun setPrimaryTextColor(color: Int) { } - override fun setIsDreaming(isDreaming: Boolean) { - } - override fun setUiSurface(uiSurface: String) { } @@ -811,9 +808,6 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { override fun setPrimaryTextColor(color: Int) { } - override fun setIsDreaming(isDreaming: Boolean) { - } - override fun setUiSurface(uiSurface: String) { } @@ -838,9 +832,6 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { override fun setPrimaryTextColor(color: Int) { } - override fun setIsDreaming(isDreaming: Boolean) { - } - override fun setUiSurface(uiSurface: String) { }