Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 142d3f5a authored by Xiaowen Lei's avatar Xiaowen Lei Committed by Automerger Merge Worker
Browse files

Merge "Deprecate `setIsDreaming` in favor of `setUiSurface`." into tm-qpr-dev... 

Merge "Deprecate `setIsDreaming` in favor of `setUiSurface`." into tm-qpr-dev am: e4529489 am: 0d11e6f8

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



Change-Id: Ia195bde01c686077c41c4fde82a5de1ead225b56
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents fcdb25c5 0d11e6f8

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

+0 −6
Original line number Diff line number Diff line
@@ -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.

         */

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

+2 −1
Original line number Diff line number Diff line
@@ -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 {

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

+0 −2
Original line number Diff line number Diff line
@@ -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) {}

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

+0 −9
Original line number Diff line number Diff line
@@ -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) {

            }