diff options
4 files changed, 19 insertions, 4 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 d4b4a746a5a2..f492c069ac7e 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 @@ -94,6 +94,12 @@ 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); + + /** * Range [0.0 - 1.0] when transitioning from Lockscreen to/from AOD */ void setDozeAmount(float amount); diff --git a/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt index 9b99c522aab9..a3095472783b 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt @@ -98,6 +98,7 @@ class DreamsSmartspaceController @Inject constructor( view.setPrimaryTextColor(Color.WHITE) smartspaceViews.add(view) connectSession() + view.setDozeAmount(0f) } override fun onViewDetachedFromWindow(v: View) { @@ -127,6 +128,7 @@ class DreamsSmartspaceController @Inject constructor( } val view = buildView(parent) + connectSession() return view @@ -136,12 +138,13 @@ class DreamsSmartspaceController @Inject constructor( return if (plugin != null) { var view = smartspaceViewComponentFactory.create(parent, plugin, stateChangeListener) .getView() - - if (view is View) { - return view + if (view !is View) { + return null } - return null + view.setIsDreaming(true) + + return view } else { null } 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 57803e874f93..834090057334 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt @@ -136,6 +136,8 @@ class DreamSmartspaceControllerTest : SysuiTestCase() { override fun setPrimaryTextColor(color: Int) {} + override fun setIsDreaming(isDreaming: Boolean) {} + override fun setDozeAmount(amount: Float) {} override fun setIntentStarter(intentStarter: BcSmartspaceDataPlugin.IntentStarter?) {} @@ -173,6 +175,7 @@ class DreamSmartspaceControllerTest : SysuiTestCase() { stateChangeListener.onViewAttachedToWindow(mockView) verify(smartspaceManager).createSmartspaceSession(any()) + verify(mockView).setDozeAmount(0f) stateChangeListener.onViewDetachedFromWindow(mockView) 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 188baaf682b0..ce58a6c82142 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 @@ -544,6 +544,9 @@ class LockscreenSmartspaceControllerTest : SysuiTestCase() { override fun setPrimaryTextColor(color: Int) { } + override fun setIsDreaming(isDreaming: Boolean) { + } + override fun setDozeAmount(amount: Float) { } |