Merge "Rename DreamsSmartspaceController to DreamSmartspaceController." into tm-qpr-dev (4d96edfb) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java

+7 −7

Original line number	Diff line number	Diff line
		@@ -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;
		}

packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamsSmartspaceController.kt→packages/SystemUI/src/com/android/systemui/dreams/smartspace/DreamSmartspaceController.kt

+2 −2

Original line number	Diff line number	Diff line
		@@ -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<BcSmartspaceDataPlugin>
		) {
		companion object {
		private const val TAG = "DreamsSmartspaceCtrlr"
		private const val TAG = "DreamSmartspaceCtrlr"
		}

		private var session: SmartspaceSession? = null

packages/SystemUI/tests/src/com/android/systemui/dreams/SmartSpaceComplicationTest.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -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;

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

+3 −3

Original line number	Diff line number	Diff line
		@@ -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))