From a9f53c7609d2a0e59b45c730ca8195a8aa38def6 Mon Sep 17 00:00:00 2001 From: Xiaowen Lei Date: Sat, 23 Apr 2022 03:24:57 +0000 Subject: [PATCH] Rename DreamsSmartspaceController to DreamSmartspaceController. The extra 's' seems like a typo. The corresponding test file doesn't have the 's'. Test: N/A Change-Id: Icab4ebecff255ae3b2e719d0718abddcbc8691fa --- .../systemui/dreams/SmartSpaceComplication.java | 14 +++++++------- ...eController.kt => DreamSmartspaceController.kt} | 4 ++-- .../dreams/SmartSpaceComplicationTest.java | 4 ++-- .../smartspace/DreamSmartspaceControllerTest.kt | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) rename packages/SystemUI/src/com/android/systemui/dreams/smartspace/{DreamsSmartspaceController.kt => DreamSmartspaceController.kt} (98%) diff --git a/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java b/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java index a83e006dfa2f9..7666eb84acac0 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java @@ -26,7 +26,7 @@ import com.android.systemui.CoreStartable; import com.android.systemui.dreams.complication.Complication; import com.android.systemui.dreams.complication.ComplicationLayoutParams; import com.android.systemui.dreams.complication.ComplicationViewModel; -import com.android.systemui.dreams.smartspace.DreamsSmartspaceController; +import com.android.systemui.dreams.smartspace.DreamSmartspaceController; import com.android.systemui.plugins.BcSmartspaceDataPlugin; import java.util.List; @@ -43,7 +43,7 @@ public class SmartSpaceComplication implements Complication { * SystemUI. */ public static class Registrant extends CoreStartable { - private final DreamsSmartspaceController mSmartSpaceController; + private final DreamSmartspaceController mSmartSpaceController; private final DreamOverlayStateController mDreamOverlayStateController; private final SmartSpaceComplication mComplication; @@ -66,7 +66,7 @@ public class SmartSpaceComplication implements Complication { public Registrant(Context context, DreamOverlayStateController dreamOverlayStateController, SmartSpaceComplication smartSpaceComplication, - DreamsSmartspaceController smartSpaceController) { + DreamSmartspaceController smartSpaceController) { super(context); mDreamOverlayStateController = dreamOverlayStateController; mComplication = smartSpaceComplication; @@ -90,12 +90,12 @@ public class SmartSpaceComplication implements Complication { private static class SmartSpaceComplicationViewHolder implements ViewHolder { private static final int SMARTSPACE_COMPLICATION_WEIGHT = 10; - private final DreamsSmartspaceController mSmartSpaceController; + private final DreamSmartspaceController mSmartSpaceController; private final Context mContext; protected SmartSpaceComplicationViewHolder( Context context, - DreamsSmartspaceController smartSpaceController) { + DreamSmartspaceController smartSpaceController) { mSmartSpaceController = smartSpaceController; mContext = context; } @@ -120,12 +120,12 @@ public class SmartSpaceComplication implements Complication { } } - private final DreamsSmartspaceController mSmartSpaceController; + private final DreamSmartspaceController mSmartSpaceController; private final Context mContext; @Inject public SmartSpaceComplication(Context context, - DreamsSmartspaceController smartSpaceController) { + DreamSmartspaceController smartSpaceController) { mContext = context; mSmartSpaceController = smartSpaceController; } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt b/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamSmartspaceController.kt similarity index 98% rename from packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt rename to packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamSmartspaceController.kt index a3095472783b1..da2cf84318dec 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamSmartspaceController.kt @@ -46,7 +46,7 @@ import javax.inject.Named * Controller for managing the smartspace view on the dream */ @SysUISingleton -class DreamsSmartspaceController @Inject constructor( +class DreamSmartspaceController @Inject constructor( private val context: Context, private val smartspaceManager: SmartspaceManager, private val execution: Execution, @@ -58,7 +58,7 @@ class DreamsSmartspaceController @Inject constructor( @Named(DREAM_SMARTSPACE_DATA_PLUGIN) optionalPlugin: Optional ) { companion object { - private const val TAG = "DreamsSmartspaceCtrlr" + private const val TAG = "DreamSmartspaceCtrlr" } private var session: SmartspaceSession? = null diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/SmartSpaceComplicationTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/SmartSpaceComplicationTest.java index ed1cf69ad8c02..cefdf283fc7d0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/SmartSpaceComplicationTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/SmartSpaceComplicationTest.java @@ -27,7 +27,7 @@ import android.testing.AndroidTestingRunner; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; -import com.android.systemui.dreams.smartspace.DreamsSmartspaceController; +import com.android.systemui.dreams.smartspace.DreamSmartspaceController; import com.android.systemui.plugins.BcSmartspaceDataPlugin; import org.junit.Before; @@ -47,7 +47,7 @@ public class SmartSpaceComplicationTest extends SysuiTestCase { private Context mContext; @Mock - private DreamsSmartspaceController mSmartspaceController; + private DreamSmartspaceController mSmartspaceController; @Mock private DreamOverlayStateController mDreamOverlayStateController; 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 8340900573343..446b51d40f60e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/smartspace/DreamSmartspaceControllerTest.kt @@ -26,7 +26,7 @@ import android.view.View import android.view.ViewGroup import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.dreams.smartspace.DreamsSmartspaceController +import com.android.systemui.dreams.smartspace.DreamSmartspaceController import com.android.systemui.plugins.BcSmartspaceDataPlugin import com.android.systemui.plugins.FalsingManager import com.android.systemui.smartspace.dagger.SmartspaceViewComponent @@ -97,7 +97,7 @@ class DreamSmartspaceControllerTest : SysuiTestCase() { */ @Test fun testConnectOnListen() { - val controller = DreamsSmartspaceController(context, + val controller = DreamSmartspaceController(context, smartspaceManager, execution, uiExecutor, viewComponentFactory, precondition, Optional.of(targetFilter), Optional.of(plugin)) @@ -158,7 +158,7 @@ class DreamSmartspaceControllerTest : SysuiTestCase() { */ @Test fun testConnectOnViewCreate() { - val controller = DreamsSmartspaceController(context, + val controller = DreamSmartspaceController(context, smartspaceManager, execution, uiExecutor, viewComponentFactory, precondition, Optional.of(targetFilter), Optional.of(plugin))