diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/Complication.java b/packages/SystemUI/src/com/android/systemui/complication/Complication.java similarity index 99% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/Complication.java rename to packages/SystemUI/src/com/android/systemui/complication/Complication.java index b07efdfff5f2b..6b06752045065 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/Complication.java +++ b/packages/SystemUI/src/com/android/systemui/complication/Complication.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import android.annotation.IntDef; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationCollectionLiveData.java b/packages/SystemUI/src/com/android/systemui/complication/ComplicationCollectionLiveData.java similarity index 97% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationCollectionLiveData.java rename to packages/SystemUI/src/com/android/systemui/complication/ComplicationCollectionLiveData.java index f6fe8d2e579c8..ac38b8dcc2c50 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationCollectionLiveData.java +++ b/packages/SystemUI/src/com/android/systemui/complication/ComplicationCollectionLiveData.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import androidx.lifecycle.LiveData; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationCollectionViewModel.java b/packages/SystemUI/src/com/android/systemui/complication/ComplicationCollectionViewModel.java similarity index 97% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationCollectionViewModel.java rename to packages/SystemUI/src/com/android/systemui/complication/ComplicationCollectionViewModel.java index 7190d7a0190ab..5e3b14e72e90d 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationCollectionViewModel.java +++ b/packages/SystemUI/src/com/android/systemui/complication/ComplicationCollectionViewModel.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import androidx.lifecycle.LiveData; import androidx.lifecycle.Transformations; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationHostViewController.java b/packages/SystemUI/src/com/android/systemui/complication/ComplicationHostViewController.java similarity index 96% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationHostViewController.java rename to packages/SystemUI/src/com/android/systemui/complication/ComplicationHostViewController.java index aad209090a21c..8527dcb3794ff 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationHostViewController.java +++ b/packages/SystemUI/src/com/android/systemui/complication/ComplicationHostViewController.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; -import static com.android.systemui.dreams.complication.dagger.ComplicationHostViewModule.SCOPED_COMPLICATIONS_LAYOUT; -import static com.android.systemui.dreams.complication.dagger.ComplicationModule.SCOPED_COMPLICATIONS_MODEL; +import static com.android.systemui.complication.dagger.ComplicationHostViewModule.SCOPED_COMPLICATIONS_LAYOUT; +import static com.android.systemui.complication.dagger.ComplicationModule.SCOPED_COMPLICATIONS_MODEL; import android.graphics.Rect; import android.graphics.Region; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationId.java b/packages/SystemUI/src/com/android/systemui/complication/ComplicationId.java similarity index 96% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationId.java rename to packages/SystemUI/src/com/android/systemui/complication/ComplicationId.java index 420359c46b546..d7bdce3bbe2e5 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationId.java +++ b/packages/SystemUI/src/com/android/systemui/complication/ComplicationId.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; /** * A {@link ComplicationId} is a value to uniquely identify a complication during the current diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationLayoutEngine.java b/packages/SystemUI/src/com/android/systemui/complication/ComplicationLayoutEngine.java similarity index 97% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationLayoutEngine.java rename to packages/SystemUI/src/com/android/systemui/complication/ComplicationLayoutEngine.java index 3e9b0103470cb..e82564dc8a898 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationLayoutEngine.java +++ b/packages/SystemUI/src/com/android/systemui/complication/ComplicationLayoutEngine.java @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; -import static com.android.systemui.dreams.complication.dagger.ComplicationHostViewModule.COMPLICATIONS_FADE_IN_DURATION; -import static com.android.systemui.dreams.complication.dagger.ComplicationHostViewModule.COMPLICATIONS_FADE_OUT_DURATION; -import static com.android.systemui.dreams.complication.dagger.ComplicationHostViewModule.COMPLICATION_MARGIN_DEFAULT; -import static com.android.systemui.dreams.complication.dagger.ComplicationHostViewModule.SCOPED_COMPLICATIONS_LAYOUT; +import static com.android.systemui.complication.dagger.ComplicationHostViewModule.COMPLICATIONS_FADE_IN_DURATION; +import static com.android.systemui.complication.dagger.ComplicationHostViewModule.COMPLICATIONS_FADE_OUT_DURATION; +import static com.android.systemui.complication.dagger.ComplicationHostViewModule.COMPLICATION_MARGIN_DEFAULT; +import static com.android.systemui.complication.dagger.ComplicationHostViewModule.SCOPED_COMPLICATIONS_LAYOUT; import android.util.Log; import android.view.View; @@ -29,8 +29,8 @@ import androidx.constraintlayout.widget.ConstraintLayout; import androidx.constraintlayout.widget.Constraints; import com.android.systemui.R; -import com.android.systemui.dreams.complication.ComplicationLayoutParams.Position; -import com.android.systemui.dreams.complication.dagger.ComplicationModule; +import com.android.systemui.complication.ComplicationLayoutParams.Position; +import com.android.systemui.complication.dagger.ComplicationModule; import com.android.systemui.statusbar.CrossFadeHelper; import com.android.systemui.touch.TouchInsetManager; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationLayoutParams.java b/packages/SystemUI/src/com/android/systemui/complication/ComplicationLayoutParams.java similarity index 99% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationLayoutParams.java rename to packages/SystemUI/src/com/android/systemui/complication/ComplicationLayoutParams.java index 99e19fc96d8ff..71ba720a9589d 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationLayoutParams.java +++ b/packages/SystemUI/src/com/android/systemui/complication/ComplicationLayoutParams.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import android.annotation.IntDef; import android.view.ViewGroup; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationTypesUpdater.java b/packages/SystemUI/src/com/android/systemui/complication/ComplicationTypesUpdater.java similarity index 98% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationTypesUpdater.java rename to packages/SystemUI/src/com/android/systemui/complication/ComplicationTypesUpdater.java index 1702eac6d02a4..016891df4b3bb 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationTypesUpdater.java +++ b/packages/SystemUI/src/com/android/systemui/complication/ComplicationTypesUpdater.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import static com.android.systemui.dreams.dagger.DreamModule.DREAM_PRETEXT_MONITOR; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationUtils.java b/packages/SystemUI/src/com/android/systemui/complication/ComplicationUtils.java similarity index 73% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationUtils.java rename to packages/SystemUI/src/com/android/systemui/complication/ComplicationUtils.java index 18aacd21bd122..183053a1bb1cd 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationUtils.java +++ b/packages/SystemUI/src/com/android/systemui/complication/ComplicationUtils.java @@ -14,17 +14,17 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_AIR_QUALITY; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_CAST_INFO; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_DATE; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_HOME_CONTROLS; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_MEDIA_ENTRY; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_NONE; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_SMARTSPACE; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_TIME; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_WEATHER; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_AIR_QUALITY; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_CAST_INFO; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_DATE; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_HOME_CONTROLS; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_MEDIA_ENTRY; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_NONE; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_SMARTSPACE; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_TIME; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_WEATHER; import com.android.settingslib.dream.DreamBackend; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationViewModel.java b/packages/SystemUI/src/com/android/systemui/complication/ComplicationViewModel.java similarity index 97% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationViewModel.java rename to packages/SystemUI/src/com/android/systemui/complication/ComplicationViewModel.java index 00cf58c0c6653..61b948e1cce5a 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationViewModel.java +++ b/packages/SystemUI/src/com/android/systemui/complication/ComplicationViewModel.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import androidx.lifecycle.ViewModel; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationViewModelProvider.java b/packages/SystemUI/src/com/android/systemui/complication/ComplicationViewModelProvider.java similarity index 89% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationViewModelProvider.java rename to packages/SystemUI/src/com/android/systemui/complication/ComplicationViewModelProvider.java index cc17ea1ee7b90..2287171015fbb 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationViewModelProvider.java +++ b/packages/SystemUI/src/com/android/systemui/complication/ComplicationViewModelProvider.java @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelStore; -import com.android.systemui.dreams.complication.dagger.DaggerViewModelProviderFactory; +import com.android.systemui.complication.dagger.DaggerViewModelProviderFactory; import javax.inject.Inject; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationViewModelTransformer.java b/packages/SystemUI/src/com/android/systemui/complication/ComplicationViewModelTransformer.java similarity index 93% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationViewModelTransformer.java rename to packages/SystemUI/src/com/android/systemui/complication/ComplicationViewModelTransformer.java index 5d113dde624e7..482bbec067e2c 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/ComplicationViewModelTransformer.java +++ b/packages/SystemUI/src/com/android/systemui/complication/ComplicationViewModelTransformer.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; -import com.android.systemui.dreams.complication.dagger.ComplicationViewModelComponent; +import com.android.systemui.complication.dagger.ComplicationViewModelComponent; import java.util.HashMap; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamClockTimeComplication.java b/packages/SystemUI/src/com/android/systemui/complication/DreamClockTimeComplication.java similarity index 92% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/DreamClockTimeComplication.java rename to packages/SystemUI/src/com/android/systemui/complication/DreamClockTimeComplication.java index bb1e6e2ef06d3..5020480f8d60f 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamClockTimeComplication.java +++ b/packages/SystemUI/src/com/android/systemui/complication/DreamClockTimeComplication.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; -import static com.android.systemui.dreams.complication.dagger.DreamClockTimeComplicationModule.DREAM_CLOCK_TIME_COMPLICATION_VIEW; -import static com.android.systemui.dreams.complication.dagger.RegisteredComplicationsModule.DREAM_CLOCK_TIME_COMPLICATION_LAYOUT_PARAMS; +import static com.android.systemui.complication.dagger.DreamClockTimeComplicationModule.DREAM_CLOCK_TIME_COMPLICATION_VIEW; +import static com.android.systemui.complication.dagger.RegisteredComplicationsModule.DREAM_CLOCK_TIME_COMPLICATION_LAYOUT_PARAMS; import static com.android.systemui.dreams.dagger.DreamModule.DREAM_PRETEXT_MONITOR; import android.view.View; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamHomeControlsComplication.java b/packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java similarity index 96% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/DreamHomeControlsComplication.java rename to packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java index 82a885892b751..8f192de8c4a5c 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamHomeControlsComplication.java +++ b/packages/SystemUI/src/com/android/systemui/complication/DreamHomeControlsComplication.java @@ -14,13 +14,13 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; +import static com.android.systemui.complication.dagger.DreamHomeControlsComplicationComponent.DreamHomeControlsModule.DREAM_HOME_CONTROLS_CHIP_VIEW; +import static com.android.systemui.complication.dagger.RegisteredComplicationsModule.DREAM_HOME_CONTROLS_CHIP_LAYOUT_PARAMS; import static com.android.systemui.controls.dagger.ControlsComponent.Visibility.AVAILABLE; import static com.android.systemui.controls.dagger.ControlsComponent.Visibility.AVAILABLE_AFTER_UNLOCK; import static com.android.systemui.controls.dagger.ControlsComponent.Visibility.UNAVAILABLE; -import static com.android.systemui.dreams.complication.dagger.DreamHomeControlsComplicationComponent.DreamHomeControlsModule.DREAM_HOME_CONTROLS_CHIP_VIEW; -import static com.android.systemui.dreams.complication.dagger.RegisteredComplicationsModule.DREAM_HOME_CONTROLS_CHIP_LAYOUT_PARAMS; import static com.android.systemui.dreams.dagger.DreamModule.DREAM_PRETEXT_MONITOR; import android.content.Context; @@ -34,13 +34,13 @@ import com.android.internal.logging.UiEvent; import com.android.internal.logging.UiEventLogger; import com.android.systemui.CoreStartable; import com.android.systemui.animation.ActivityLaunchAnimator; +import com.android.systemui.complication.dagger.DreamHomeControlsComplicationComponent; import com.android.systemui.controls.ControlsServiceInfo; import com.android.systemui.controls.dagger.ControlsComponent; import com.android.systemui.controls.management.ControlsListingController; import com.android.systemui.controls.ui.ControlsActivity; import com.android.systemui.controls.ui.ControlsUiController; import com.android.systemui.dreams.DreamOverlayStateController; -import com.android.systemui.dreams.complication.dagger.DreamHomeControlsComplicationComponent; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.shared.condition.Monitor; import com.android.systemui.util.ViewController; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamMediaEntryComplication.java b/packages/SystemUI/src/com/android/systemui/complication/DreamMediaEntryComplication.java similarity index 94% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/DreamMediaEntryComplication.java rename to packages/SystemUI/src/com/android/systemui/complication/DreamMediaEntryComplication.java index deff0608bedd0..6a7278529a543 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/DreamMediaEntryComplication.java +++ b/packages/SystemUI/src/com/android/systemui/complication/DreamMediaEntryComplication.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; -import static com.android.systemui.dreams.complication.dagger.DreamMediaEntryComplicationComponent.DreamMediaEntryModule.DREAM_MEDIA_ENTRY_VIEW; -import static com.android.systemui.dreams.complication.dagger.RegisteredComplicationsModule.DREAM_MEDIA_ENTRY_LAYOUT_PARAMS; +import static com.android.systemui.complication.dagger.DreamMediaEntryComplicationComponent.DreamMediaEntryModule.DREAM_MEDIA_ENTRY_VIEW; +import static com.android.systemui.complication.dagger.RegisteredComplicationsModule.DREAM_MEDIA_ENTRY_LAYOUT_PARAMS; import static com.android.systemui.flags.Flags.DREAM_MEDIA_TAP_TO_OPEN; import android.app.PendingIntent; @@ -25,8 +25,8 @@ import android.util.Log; import android.view.View; import com.android.systemui.ActivityIntentHelper; +import com.android.systemui.complication.dagger.DreamMediaEntryComplicationComponent; import com.android.systemui.dreams.DreamOverlayStateController; -import com.android.systemui.dreams.complication.dagger.DreamMediaEntryComplicationComponent; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.media.controls.ui.MediaCarouselController; import com.android.systemui.media.dream.MediaDreamComplication; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java b/packages/SystemUI/src/com/android/systemui/complication/SmartSpaceComplication.java similarity index 97% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java rename to packages/SystemUI/src/com/android/systemui/complication/SmartSpaceComplication.java index ff1f31245570c..2f5ef6da6912e 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/SmartSpaceComplication.java +++ b/packages/SystemUI/src/com/android/systemui/complication/SmartSpaceComplication.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; -import static com.android.systemui.dreams.complication.dagger.RegisteredComplicationsModule.DREAM_SMARTSPACE_LAYOUT_PARAMS; +import static com.android.systemui.complication.dagger.RegisteredComplicationsModule.DREAM_SMARTSPACE_LAYOUT_PARAMS; import static com.android.systemui.dreams.dagger.DreamModule.DREAM_PRETEXT_MONITOR; import android.content.Context; diff --git a/packages/SystemUI/src/com/android/systemui/complication/dagger/ComplicationComponent.kt b/packages/SystemUI/src/com/android/systemui/complication/dagger/ComplicationComponent.kt new file mode 100644 index 0000000000000..018914772f57e --- /dev/null +++ b/packages/SystemUI/src/com/android/systemui/complication/dagger/ComplicationComponent.kt @@ -0,0 +1,29 @@ +package com.android.systemui.complication.dagger + +import androidx.lifecycle.LifecycleOwner +import androidx.lifecycle.ViewModelStore +import com.android.systemui.complication.Complication +import com.android.systemui.complication.ComplicationHostViewController +import com.android.systemui.complication.ComplicationLayoutEngine +import com.android.systemui.touch.TouchInsetManager +import dagger.BindsInstance +import dagger.Subcomponent + +@Subcomponent(modules = [ComplicationModule::class]) +@ComplicationModule.ComplicationScope +interface ComplicationComponent { + /** Factory for generating [ComplicationComponent]. */ + @Subcomponent.Factory + interface Factory { + fun create( + @BindsInstance lifecycleOwner: LifecycleOwner, + @BindsInstance host: Complication.Host, + @BindsInstance viewModelStore: ViewModelStore, + @BindsInstance touchInsetManager: TouchInsetManager + ): ComplicationComponent + } + + fun getComplicationHostViewController(): ComplicationHostViewController + + fun getVisibilityController(): ComplicationLayoutEngine +} diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationHostViewModule.java b/packages/SystemUI/src/com/android/systemui/complication/dagger/ComplicationHostViewModule.java similarity index 96% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationHostViewModule.java rename to packages/SystemUI/src/com/android/systemui/complication/dagger/ComplicationHostViewModule.java index 797906fbaf8e0..1158565b9c379 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationHostViewModule.java +++ b/packages/SystemUI/src/com/android/systemui/complication/dagger/ComplicationHostViewModule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication.dagger; +package com.android.systemui.complication.dagger; import android.content.res.Resources; import android.view.LayoutInflater; @@ -44,7 +44,7 @@ public abstract class ComplicationHostViewModule { /** * Generates a {@link ConstraintLayout}, which can host - * {@link com.android.systemui.dreams.complication.Complication} instances. + * {@link com.android.systemui.complication.Complication} instances. */ @Provides @Named(SCOPED_COMPLICATIONS_LAYOUT) diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationModule.java b/packages/SystemUI/src/com/android/systemui/complication/dagger/ComplicationModule.java similarity index 90% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationModule.java rename to packages/SystemUI/src/com/android/systemui/complication/dagger/ComplicationModule.java index dbf5ab000a8a6..57841af28c091 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationModule.java +++ b/packages/SystemUI/src/com/android/systemui/complication/dagger/ComplicationModule.java @@ -14,16 +14,16 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication.dagger; +package com.android.systemui.complication.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelStore; -import com.android.systemui.dreams.complication.Complication; -import com.android.systemui.dreams.complication.ComplicationCollectionViewModel; -import com.android.systemui.dreams.complication.ComplicationLayoutEngine; +import com.android.systemui.complication.Complication; +import com.android.systemui.complication.ComplicationCollectionViewModel; +import com.android.systemui.complication.ComplicationLayoutEngine; import com.android.systemui.touch.TouchInsetManager; import dagger.Module; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationViewModelComponent.java b/packages/SystemUI/src/com/android/systemui/complication/dagger/ComplicationViewModelComponent.java similarity index 78% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationViewModelComponent.java rename to packages/SystemUI/src/com/android/systemui/complication/dagger/ComplicationViewModelComponent.java index 703cd28a3c254..d2d36985e4789 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationViewModelComponent.java +++ b/packages/SystemUI/src/com/android/systemui/complication/dagger/ComplicationViewModelComponent.java @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.dreams.complication.dagger; +package com.android.systemui.complication.dagger; -import com.android.systemui.dreams.complication.Complication; -import com.android.systemui.dreams.complication.ComplicationId; -import com.android.systemui.dreams.complication.ComplicationViewModelProvider; +import com.android.systemui.complication.Complication; +import com.android.systemui.complication.ComplicationId; +import com.android.systemui.complication.ComplicationViewModelProvider; import dagger.BindsInstance; import dagger.Subcomponent; /** * The {@link ComplicationViewModelComponent} allows for a - * {@link com.android.systemui.dreams.complication.ComplicationViewModel} for a particular + * {@link com.android.systemui.complication.ComplicationViewModel} for a particular * {@link Complication}. This component binds these instance specific values to allow injection with * values provided at the wider scope. */ diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DaggerViewModelProviderFactory.java b/packages/SystemUI/src/com/android/systemui/complication/dagger/DaggerViewModelProviderFactory.java similarity index 96% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DaggerViewModelProviderFactory.java rename to packages/SystemUI/src/com/android/systemui/complication/dagger/DaggerViewModelProviderFactory.java index 8ffedec9b4921..b4ec40fc77614 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DaggerViewModelProviderFactory.java +++ b/packages/SystemUI/src/com/android/systemui/complication/dagger/DaggerViewModelProviderFactory.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication.dagger; +package com.android.systemui.complication.dagger; import androidx.annotation.NonNull; import androidx.lifecycle.ViewModel; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockTimeComplicationModule.java b/packages/SystemUI/src/com/android/systemui/complication/dagger/DreamClockTimeComplicationModule.java similarity index 92% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockTimeComplicationModule.java rename to packages/SystemUI/src/com/android/systemui/complication/dagger/DreamClockTimeComplicationModule.java index 5290e44aa7fb9..fd711eed53b87 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamClockTimeComplicationModule.java +++ b/packages/SystemUI/src/com/android/systemui/complication/dagger/DreamClockTimeComplicationModule.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication.dagger; +package com.android.systemui.complication.dagger; import android.view.LayoutInflater; @@ -23,13 +23,13 @@ import android.widget.TextClock; import com.android.internal.util.Preconditions; import com.android.systemui.R; -import com.android.systemui.dreams.complication.DreamClockTimeComplication; - -import javax.inject.Named; +import com.android.systemui.complication.DreamClockTimeComplication; import dagger.Module; import dagger.Provides; +import javax.inject.Named; + /** * Module for providing {@link DreamClockTimeComplication}. */ diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamHomeControlsComplicationComponent.java b/packages/SystemUI/src/com/android/systemui/complication/dagger/DreamHomeControlsComplicationComponent.java similarity index 94% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamHomeControlsComplicationComponent.java rename to packages/SystemUI/src/com/android/systemui/complication/dagger/DreamHomeControlsComplicationComponent.java index cf05d2d9cda03..ef18d660ef36c 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamHomeControlsComplicationComponent.java +++ b/packages/SystemUI/src/com/android/systemui/complication/dagger/DreamHomeControlsComplicationComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication.dagger; +package com.android.systemui.complication.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -22,7 +22,12 @@ import android.view.LayoutInflater; import android.widget.ImageView; import com.android.systemui.R; -import com.android.systemui.dreams.complication.DreamHomeControlsComplication; +import com.android.systemui.complication.DreamHomeControlsComplication; + +import dagger.Module; +import dagger.Provides; +import dagger.Subcomponent; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; @@ -30,10 +35,6 @@ import java.lang.annotation.Retention; import javax.inject.Named; import javax.inject.Scope; -import dagger.Module; -import dagger.Provides; -import dagger.Subcomponent; - /** * Responsible for generating dependencies for the {@link DreamHomeControlsComplication}. */ diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamMediaEntryComplicationComponent.java b/packages/SystemUI/src/com/android/systemui/complication/dagger/DreamMediaEntryComplicationComponent.java similarity index 94% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamMediaEntryComplicationComponent.java rename to packages/SystemUI/src/com/android/systemui/complication/dagger/DreamMediaEntryComplicationComponent.java index ed05daf35ed94..f15a5862104f4 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/DreamMediaEntryComplicationComponent.java +++ b/packages/SystemUI/src/com/android/systemui/complication/dagger/DreamMediaEntryComplicationComponent.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication.dagger; +package com.android.systemui.complication.dagger; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -22,7 +22,11 @@ import android.view.LayoutInflater; import android.view.View; import com.android.systemui.R; -import com.android.systemui.dreams.complication.DreamMediaEntryComplication; +import com.android.systemui.complication.DreamMediaEntryComplication; + +import dagger.Module; +import dagger.Provides; +import dagger.Subcomponent; import java.lang.annotation.Documented; import java.lang.annotation.Retention; @@ -30,10 +34,6 @@ import java.lang.annotation.Retention; import javax.inject.Named; import javax.inject.Scope; -import dagger.Module; -import dagger.Provides; -import dagger.Subcomponent; - /** * Responsible for generating dependencies for the {@link DreamMediaEntryComplication}. */ diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/RegisteredComplicationsModule.java b/packages/SystemUI/src/com/android/systemui/complication/dagger/RegisteredComplicationsModule.java similarity index 97% rename from packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/RegisteredComplicationsModule.java rename to packages/SystemUI/src/com/android/systemui/complication/dagger/RegisteredComplicationsModule.java index 3be42cb58f118..98975fbdfce29 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/RegisteredComplicationsModule.java +++ b/packages/SystemUI/src/com/android/systemui/complication/dagger/RegisteredComplicationsModule.java @@ -14,23 +14,23 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication.dagger; +package com.android.systemui.complication.dagger; import android.content.res.Resources; import android.view.ViewGroup; import com.android.systemui.R; +import com.android.systemui.complication.ComplicationLayoutParams; import com.android.systemui.dagger.SystemUIBinder; import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.dreams.complication.ComplicationLayoutParams; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; -import javax.inject.Named; - import dagger.Module; import dagger.Provides; +import javax.inject.Named; + /** * Module for all components with corresponding dream layer complications registered in * {@link SystemUIBinder}. diff --git a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java index 7945470b424ab..ac916651b9f3e 100644 --- a/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java +++ b/packages/SystemUI/src/com/android/systemui/dagger/SystemUIModule.java @@ -38,11 +38,11 @@ import com.android.systemui.biometrics.dagger.BiometricsModule; import com.android.systemui.biometrics.dagger.UdfpsModule; import com.android.systemui.classifier.FalsingModule; import com.android.systemui.clipboardoverlay.dagger.ClipboardOverlayModule; +import com.android.systemui.complication.dagger.ComplicationComponent; import com.android.systemui.controls.dagger.ControlsModule; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.demomode.dagger.DemoModeModule; import com.android.systemui.doze.dagger.DozeComponent; -import com.android.systemui.dreams.complication.dagger.ComplicationComponent; import com.android.systemui.dreams.dagger.DreamModule; import com.android.systemui.dump.DumpManager; import com.android.systemui.flags.FeatureFlags; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt index d0a92f0846d0e..5b56c04ae8aab 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayAnimationsController.kt @@ -26,11 +26,11 @@ import androidx.lifecycle.Lifecycle import androidx.lifecycle.repeatOnLifecycle import com.android.systemui.R import com.android.systemui.animation.Interpolators -import com.android.systemui.dreams.complication.ComplicationHostViewController -import com.android.systemui.dreams.complication.ComplicationLayoutParams -import com.android.systemui.dreams.complication.ComplicationLayoutParams.POSITION_BOTTOM -import com.android.systemui.dreams.complication.ComplicationLayoutParams.POSITION_TOP -import com.android.systemui.dreams.complication.ComplicationLayoutParams.Position +import com.android.systemui.complication.ComplicationHostViewController +import com.android.systemui.complication.ComplicationLayoutParams +import com.android.systemui.complication.ComplicationLayoutParams.POSITION_BOTTOM +import com.android.systemui.complication.ComplicationLayoutParams.POSITION_TOP +import com.android.systemui.complication.ComplicationLayoutParams.Position import com.android.systemui.dreams.dagger.DreamOverlayModule import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel.Companion.DREAM_ANIMATION_DURATION diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java index 7c6a748646648..15a32d21213f6 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayContainerViewController.java @@ -19,9 +19,9 @@ package com.android.systemui.dreams; import static com.android.keyguard.BouncerPanelExpansionCalculator.aboutToShowBouncerProgress; import static com.android.keyguard.BouncerPanelExpansionCalculator.getDreamAlphaScaledExpansion; import static com.android.keyguard.BouncerPanelExpansionCalculator.getDreamYPositionScaledExpansion; +import static com.android.systemui.complication.ComplicationLayoutParams.POSITION_BOTTOM; +import static com.android.systemui.complication.ComplicationLayoutParams.POSITION_TOP; import static com.android.systemui.doze.util.BurnInHelperKt.getBurnInOffset; -import static com.android.systemui.dreams.complication.ComplicationLayoutParams.POSITION_BOTTOM; -import static com.android.systemui.dreams.complication.ComplicationLayoutParams.POSITION_TOP; import android.animation.Animator; import android.content.res.Resources; @@ -36,8 +36,8 @@ import androidx.annotation.NonNull; import com.android.dream.lowlight.LowLightTransitionCoordinator; import com.android.systemui.R; import com.android.systemui.animation.Interpolators; +import com.android.systemui.complication.ComplicationHostViewController; import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.dreams.complication.ComplicationHostViewController; import com.android.systemui.dreams.dagger.DreamOverlayComponent; import com.android.systemui.dreams.dagger.DreamOverlayModule; import com.android.systemui.dreams.touch.scrim.BouncerlessScrimController; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java index 471c445748933..1da7900e985b7 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayService.java @@ -32,7 +32,6 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.annotation.VisibleForTesting; import androidx.lifecycle.Lifecycle; -import androidx.lifecycle.LifecycleOwner; import androidx.lifecycle.LifecycleRegistry; import androidx.lifecycle.ViewModelStore; @@ -42,9 +41,9 @@ import com.android.internal.logging.UiEventLogger; import com.android.internal.policy.PhoneWindow; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.keyguard.KeyguardUpdateMonitorCallback; +import com.android.systemui.complication.Complication; +import com.android.systemui.complication.dagger.ComplicationComponent; import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.dreams.complication.Complication; -import com.android.systemui.dreams.complication.dagger.ComplicationComponent; import com.android.systemui.dreams.dagger.DreamOverlayComponent; import com.android.systemui.dreams.touch.DreamOverlayTouchMonitor; import com.android.systemui.touch.TouchInsetManager; @@ -91,7 +90,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ private final ComplicationComponent mComplicationComponent; - private final com.android.systemui.dreams.dreamcomplication.dagger.ComplicationComponent + private final com.android.systemui.dreams.complication.dagger.ComplicationComponent mDreamComplicationComponent; private final DreamOverlayComponent mDreamOverlayComponent; @@ -145,7 +144,7 @@ public class DreamOverlayService extends android.service.dreams.DreamOverlayServ @Main DelayableExecutor executor, WindowManager windowManager, ComplicationComponent.Factory complicationComponentFactory, - com.android.systemui.dreams.dreamcomplication.dagger.ComplicationComponent.Factory + com.android.systemui.dreams.complication.dagger.ComplicationComponent.Factory dreamComplicationComponentFactory, DreamOverlayComponent.Factory dreamOverlayComponentFactory, DreamOverlayStateController stateController, diff --git a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java index 779098656ce37..4ae97f9b35c68 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/DreamOverlayStateController.java @@ -24,9 +24,9 @@ import android.util.Log; import androidx.annotation.NonNull; import com.android.internal.annotations.VisibleForTesting; +import com.android.systemui.complication.Complication; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; -import com.android.systemui.dreams.complication.Complication; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; import com.android.systemui.statusbar.policy.CallbackController; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dreamcomplication/HideComplicationTouchHandler.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/HideComplicationTouchHandler.java similarity index 95% rename from packages/SystemUI/src/com/android/systemui/dreams/dreamcomplication/HideComplicationTouchHandler.java rename to packages/SystemUI/src/com/android/systemui/dreams/complication/HideComplicationTouchHandler.java index 3a4578b6f7441..410a0c53a4921 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/dreamcomplication/HideComplicationTouchHandler.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/HideComplicationTouchHandler.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.systemui.dreams.dreamcomplication; +package com.android.systemui.dreams.complication; -import static com.android.systemui.dreams.dreamcomplication.dagger.ComplicationModule.COMPLICATIONS_FADE_OUT_DELAY; -import static com.android.systemui.dreams.dreamcomplication.dagger.ComplicationModule.COMPLICATIONS_RESTORE_TIMEOUT; +import static com.android.systemui.dreams.complication.dagger.ComplicationModule.COMPLICATIONS_FADE_OUT_DELAY; +import static com.android.systemui.dreams.complication.dagger.ComplicationModule.COMPLICATIONS_RESTORE_TIMEOUT; import android.util.Log; import android.view.MotionEvent; @@ -25,9 +25,9 @@ import android.view.View; import androidx.annotation.Nullable; +import com.android.systemui.complication.Complication; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dreams.DreamOverlayStateController; -import com.android.systemui.dreams.complication.Complication; import com.android.systemui.dreams.touch.DreamOverlayTouchMonitor; import com.android.systemui.dreams.touch.DreamTouchHandler; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationComponent.kt b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationComponent.kt index 8d133bd252752..492c50255b180 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationComponent.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationComponent.kt @@ -1,29 +1,21 @@ package com.android.systemui.dreams.complication.dagger -import androidx.lifecycle.LifecycleOwner -import androidx.lifecycle.ViewModelStore -import com.android.systemui.dreams.complication.Complication -import com.android.systemui.dreams.complication.ComplicationHostViewController -import com.android.systemui.dreams.complication.ComplicationLayoutEngine +import com.android.systemui.complication.Complication +import com.android.systemui.dreams.complication.HideComplicationTouchHandler import com.android.systemui.touch.TouchInsetManager import dagger.BindsInstance import dagger.Subcomponent @Subcomponent(modules = [ComplicationModule::class]) -@ComplicationModule.ComplicationScope interface ComplicationComponent { /** Factory for generating [ComplicationComponent]. */ @Subcomponent.Factory interface Factory { fun create( - @BindsInstance lifecycleOwner: LifecycleOwner, - @BindsInstance host: Complication.Host, - @BindsInstance viewModelStore: ViewModelStore, + @BindsInstance visibilityController: Complication.VisibilityController, @BindsInstance touchInsetManager: TouchInsetManager ): ComplicationComponent } - fun getComplicationHostViewController(): ComplicationHostViewController - - fun getVisibilityController(): ComplicationLayoutEngine + fun getHideComplicationTouchHandler(): HideComplicationTouchHandler } diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dreamcomplication/dagger/ComplicationModule.kt b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationModule.kt similarity index 93% rename from packages/SystemUI/src/com/android/systemui/dreams/dreamcomplication/dagger/ComplicationModule.kt rename to packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationModule.kt index ef75ce173e940..95c225de9598f 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/dreamcomplication/dagger/ComplicationModule.kt +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/ComplicationModule.kt @@ -1,4 +1,4 @@ -package com.android.systemui.dreams.dreamcomplication.dagger +package com.android.systemui.dreams.complication.dagger import android.content.res.Resources import com.android.systemui.R diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java index f130026b76b40..1271645dac4e9 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamModule.java @@ -24,12 +24,12 @@ import android.content.res.Resources; import com.android.dream.lowlight.dagger.LowLightDreamModule; import com.android.settingslib.dream.DreamBackend; import com.android.systemui.R; +import com.android.systemui.complication.dagger.RegisteredComplicationsModule; import com.android.systemui.dagger.SysUISingleton; import com.android.systemui.dagger.qualifiers.Main; import com.android.systemui.dreams.DreamOverlayNotificationCountProvider; import com.android.systemui.dreams.DreamOverlayService; -import com.android.systemui.dreams.complication.dagger.RegisteredComplicationsModule; -import com.android.systemui.dreams.dreamcomplication.dagger.ComplicationComponent; +import com.android.systemui.dreams.complication.dagger.ComplicationComponent; import com.android.systemui.dreams.touch.scrim.dagger.ScrimModule; import com.android.systemui.process.condition.SystemProcessCondition; import com.android.systemui.shared.condition.Condition; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayComponent.java b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayComponent.java index 0332f888c866a..cb587c2f96c77 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayComponent.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/dagger/DreamOverlayComponent.java @@ -24,8 +24,8 @@ import android.annotation.Nullable; import androidx.lifecycle.LifecycleOwner; +import com.android.systemui.complication.ComplicationHostViewController; import com.android.systemui.dreams.DreamOverlayContainerViewController; -import com.android.systemui.dreams.complication.ComplicationHostViewController; import com.android.systemui.dreams.touch.DreamOverlayTouchMonitor; import com.android.systemui.dreams.touch.DreamTouchHandler; import com.android.systemui.dreams.touch.dagger.DreamTouchModule; diff --git a/packages/SystemUI/src/com/android/systemui/dreams/dreamcomplication/dagger/ComplicationComponent.kt b/packages/SystemUI/src/com/android/systemui/dreams/dreamcomplication/dagger/ComplicationComponent.kt deleted file mode 100644 index f2fb48d6240de..0000000000000 --- a/packages/SystemUI/src/com/android/systemui/dreams/dreamcomplication/dagger/ComplicationComponent.kt +++ /dev/null @@ -1,21 +0,0 @@ -package com.android.systemui.dreams.dreamcomplication.dagger - -import com.android.systemui.dreams.complication.Complication -import com.android.systemui.dreams.dreamcomplication.HideComplicationTouchHandler -import com.android.systemui.touch.TouchInsetManager -import dagger.BindsInstance -import dagger.Subcomponent - -@Subcomponent(modules = [ComplicationModule::class]) -interface ComplicationComponent { - /** Factory for generating [ComplicationComponent]. */ - @Subcomponent.Factory - interface Factory { - fun create( - @BindsInstance visibilityController: Complication.VisibilityController, - @BindsInstance touchInsetManager: TouchInsetManager - ): ComplicationComponent - } - - fun getHideComplicationTouchHandler(): HideComplicationTouchHandler -} diff --git a/packages/SystemUI/src/com/android/systemui/media/dream/MediaComplicationViewController.java b/packages/SystemUI/src/com/android/systemui/media/dream/MediaComplicationViewController.java index 69b5698b9042f..b4153d72e64c9 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dream/MediaComplicationViewController.java +++ b/packages/SystemUI/src/com/android/systemui/media/dream/MediaComplicationViewController.java @@ -31,7 +31,7 @@ import javax.inject.Named; /** * {@link MediaComplicationViewController} handles connecting the - * {@link com.android.systemui.dreams.complication.Complication} view to the {@link MediaHost}. + * {@link com.android.systemui.complication.Complication} view to the {@link MediaHost}. */ public class MediaComplicationViewController extends ViewController { private final MediaHost mMediaHost; diff --git a/packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamComplication.java b/packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamComplication.java index 2c35db337cdac..96c870ded33c1 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamComplication.java +++ b/packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamComplication.java @@ -16,8 +16,8 @@ package com.android.systemui.media.dream; -import com.android.systemui.dreams.complication.Complication; -import com.android.systemui.dreams.complication.ComplicationViewModel; +import com.android.systemui.complication.Complication; +import com.android.systemui.complication.ComplicationViewModel; import com.android.systemui.media.dream.dagger.MediaComplicationComponent; import javax.inject.Inject; diff --git a/packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamSentinel.java b/packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamSentinel.java index 20e8ae6719f37..08c626c9e0ebc 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamSentinel.java +++ b/packages/SystemUI/src/com/android/systemui/media/dream/MediaDreamSentinel.java @@ -24,8 +24,8 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import com.android.systemui.CoreStartable; +import com.android.systemui.complication.DreamMediaEntryComplication; import com.android.systemui.dreams.DreamOverlayStateController; -import com.android.systemui.dreams.complication.DreamMediaEntryComplication; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.media.controls.models.player.MediaData; import com.android.systemui.media.controls.models.recommendation.SmartspaceMediaData; diff --git a/packages/SystemUI/src/com/android/systemui/media/dream/MediaViewHolder.java b/packages/SystemUI/src/com/android/systemui/media/dream/MediaViewHolder.java index 128a38c639be5..80d322fd55476 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dream/MediaViewHolder.java +++ b/packages/SystemUI/src/com/android/systemui/media/dream/MediaViewHolder.java @@ -22,8 +22,8 @@ import static com.android.systemui.media.dream.dagger.MediaComplicationComponent import android.view.View; import android.widget.FrameLayout; -import com.android.systemui.dreams.complication.Complication; -import com.android.systemui.dreams.complication.ComplicationLayoutParams; +import com.android.systemui.complication.Complication; +import com.android.systemui.complication.ComplicationLayoutParams; import javax.inject.Inject; import javax.inject.Named; diff --git a/packages/SystemUI/src/com/android/systemui/media/dream/dagger/MediaComplicationComponent.java b/packages/SystemUI/src/com/android/systemui/media/dream/dagger/MediaComplicationComponent.java index 052608f17e0ee..72573a5f1321a 100644 --- a/packages/SystemUI/src/com/android/systemui/media/dream/dagger/MediaComplicationComponent.java +++ b/packages/SystemUI/src/com/android/systemui/media/dream/dagger/MediaComplicationComponent.java @@ -16,7 +16,7 @@ package com.android.systemui.media.dream.dagger; -import static com.android.systemui.dreams.complication.dagger.RegisteredComplicationsModule.DREAM_MEDIA_COMPLICATION_WEIGHT; +import static com.android.systemui.complication.dagger.RegisteredComplicationsModule.DREAM_MEDIA_COMPLICATION_WEIGHT; import static java.lang.annotation.RetentionPolicy.RUNTIME; @@ -24,22 +24,22 @@ import android.content.Context; import android.view.ViewGroup; import android.widget.FrameLayout; -import com.android.systemui.dreams.complication.ComplicationLayoutParams; +import com.android.systemui.complication.ComplicationLayoutParams; import com.android.systemui.media.dream.MediaViewHolder; +import dagger.Module; +import dagger.Provides; +import dagger.Subcomponent; + import java.lang.annotation.Documented; import java.lang.annotation.Retention; import javax.inject.Named; import javax.inject.Scope; -import dagger.Module; -import dagger.Provides; -import dagger.Subcomponent; - /** * {@link MediaComplicationComponent} is responsible for generating dependencies surrounding the - * media {@link com.android.systemui.dreams.complication.Complication}, such as view controllers + * media {@link com.android.systemui.complication.Complication}, such as view controllers * and layout details. */ @Subcomponent(modules = { diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationCollectionLiveDataTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationCollectionLiveDataTest.java similarity index 98% rename from packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationCollectionLiveDataTest.java rename to packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationCollectionLiveDataTest.java index 8fdc4918b9fd9..ca6282c66a170 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationCollectionLiveDataTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationCollectionLiveDataTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import static com.google.common.truth.Truth.assertThat; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationHostViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationHostViewControllerTest.java similarity index 99% rename from packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationHostViewControllerTest.java rename to packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationHostViewControllerTest.java index 95c6897374172..c43df17f498c7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationHostViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationHostViewControllerTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyInt; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationLayoutEngineTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationLayoutEngineTest.java similarity index 99% rename from packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationLayoutEngineTest.java rename to packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationLayoutEngineTest.java index 06a944e7a6d3f..a1d4fb4dd5832 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationLayoutEngineTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationLayoutEngineTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import static com.google.common.truth.Truth.assertThat; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationLayoutParamsTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationLayoutParamsTest.java similarity index 99% rename from packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationLayoutParamsTest.java rename to packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationLayoutParamsTest.java index e414942afb563..286972db57a34 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationLayoutParamsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationLayoutParamsTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import static com.google.common.truth.Truth.assertThat; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationTypesUpdaterTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationTypesUpdaterTest.java similarity index 98% rename from packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationTypesUpdaterTest.java rename to packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationTypesUpdaterTest.java index 0e16b4771e0fe..8cd23b27e4eb8 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationTypesUpdaterTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationTypesUpdaterTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.Mockito.never; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationUtilsTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationUtilsTest.java similarity index 78% rename from packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationUtilsTest.java rename to packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationUtilsTest.java index ea16cb567028e..235c56bcc14de 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationUtilsTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationUtilsTest.java @@ -14,18 +14,18 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_AIR_QUALITY; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_CAST_INFO; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_DATE; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_HOME_CONTROLS; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_MEDIA_ENTRY; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_SMARTSPACE; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_TIME; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_WEATHER; -import static com.android.systemui.dreams.complication.ComplicationUtils.convertComplicationType; -import static com.android.systemui.dreams.complication.ComplicationUtils.convertComplicationTypes; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_AIR_QUALITY; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_CAST_INFO; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_DATE; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_HOME_CONTROLS; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_MEDIA_ENTRY; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_SMARTSPACE; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_TIME; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_WEATHER; +import static com.android.systemui.complication.ComplicationUtils.convertComplicationType; +import static com.android.systemui.complication.ComplicationUtils.convertComplicationTypes; import static com.google.common.truth.Truth.assertThat; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationViewModelTransformerTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationViewModelTransformerTest.java similarity index 96% rename from packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationViewModelTransformerTest.java rename to packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationViewModelTransformerTest.java index 2bc427d1cd971..206babf9ec44a 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/ComplicationViewModelTransformerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/ComplicationViewModelTransformerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertNotEquals; @@ -26,7 +26,7 @@ import android.testing.AndroidTestingRunner; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; -import com.android.systemui.dreams.complication.dagger.ComplicationViewModelComponent; +import com.android.systemui.complication.dagger.ComplicationViewModelComponent; import org.junit.Before; import org.junit.Test; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamClockTimeComplicationTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/DreamClockTimeComplicationTest.java similarity index 98% rename from packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamClockTimeComplicationTest.java rename to packages/SystemUI/tests/src/com/android/systemui/complication/DreamClockTimeComplicationTest.java index f6662d05c817b..57d3a01a4f47e 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamClockTimeComplicationTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/DreamClockTimeComplicationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import static com.google.common.truth.Truth.assertThat; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamHomeControlsComplicationTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/DreamHomeControlsComplicationTest.java similarity index 97% rename from packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamHomeControlsComplicationTest.java rename to packages/SystemUI/tests/src/com/android/systemui/complication/DreamHomeControlsComplicationTest.java index aad49f9b8069f..3cbb249052226 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamHomeControlsComplicationTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/DreamHomeControlsComplicationTest.java @@ -14,10 +14,10 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_HOME_CONTROLS; import static com.android.systemui.controls.dagger.ControlsComponent.Visibility.AVAILABLE; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_HOME_CONTROLS; import static com.google.common.truth.Truth.assertThat; @@ -37,6 +37,7 @@ import androidx.test.filters.SmallTest; import com.android.internal.logging.UiEventLogger; import com.android.systemui.SysuiTestCase; import com.android.systemui.animation.view.LaunchableImageView; +import com.android.systemui.complication.dagger.DreamHomeControlsComplicationComponent; import com.android.systemui.condition.SelfExecutingMonitor; import com.android.systemui.controls.ControlsServiceInfo; import com.android.systemui.controls.controller.ControlsController; @@ -44,7 +45,6 @@ import com.android.systemui.controls.controller.StructureInfo; import com.android.systemui.controls.dagger.ControlsComponent; import com.android.systemui.controls.management.ControlsListingController; import com.android.systemui.dreams.DreamOverlayStateController; -import com.android.systemui.dreams.complication.dagger.DreamHomeControlsComplicationComponent; import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.shared.condition.Monitor; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamMediaEntryComplicationTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/DreamMediaEntryComplicationTest.java similarity index 97% rename from packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamMediaEntryComplicationTest.java rename to packages/SystemUI/tests/src/com/android/systemui/complication/DreamMediaEntryComplicationTest.java index 0295030da5107..2bf9ab264bcf0 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/DreamMediaEntryComplicationTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/DreamMediaEntryComplicationTest.java @@ -14,9 +14,9 @@ * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; -import static com.android.systemui.dreams.complication.Complication.COMPLICATION_TYPE_MEDIA_ENTRY; +import static com.android.systemui.complication.Complication.COMPLICATION_TYPE_MEDIA_ENTRY; import static com.android.systemui.flags.Flags.DREAM_MEDIA_TAP_TO_OPEN; import static com.google.common.truth.Truth.assertThat; @@ -34,8 +34,8 @@ import androidx.test.filters.SmallTest; import com.android.systemui.ActivityIntentHelper; import com.android.systemui.SysuiTestCase; +import com.android.systemui.complication.dagger.DreamMediaEntryComplicationComponent; import com.android.systemui.dreams.DreamOverlayStateController; -import com.android.systemui.dreams.complication.dagger.DreamMediaEntryComplicationComponent; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.media.controls.ui.MediaCarouselController; import com.android.systemui.media.dream.MediaDreamComplication; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/SmartSpaceComplicationTest.java b/packages/SystemUI/tests/src/com/android/systemui/complication/SmartSpaceComplicationTest.java similarity index 99% rename from packages/SystemUI/tests/src/com/android/systemui/dreams/complication/SmartSpaceComplicationTest.java rename to packages/SystemUI/tests/src/com/android/systemui/complication/SmartSpaceComplicationTest.java index 175da0b7a5c27..87de8657f593d 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/SmartSpaceComplicationTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/complication/SmartSpaceComplicationTest.java @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package com.android.systemui.dreams.complication; +package com.android.systemui.complication; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.any; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayAnimationsControllerTest.kt b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayAnimationsControllerTest.kt index 0a9470617a5fb..b7c62463899f7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayAnimationsControllerTest.kt +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayAnimationsControllerTest.kt @@ -7,7 +7,7 @@ import android.testing.AndroidTestingRunner import android.view.View import androidx.test.filters.SmallTest import com.android.systemui.SysuiTestCase -import com.android.systemui.dreams.complication.ComplicationHostViewController +import com.android.systemui.complication.ComplicationHostViewController import com.android.systemui.keyguard.ui.viewmodel.DreamingToLockscreenTransitionViewModel import com.android.systemui.statusbar.BlurUtils import com.android.systemui.statusbar.policy.ConfigurationController diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java index 18abfa546ea6e..47b7d49ac7af6 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayContainerViewControllerTest.java @@ -39,7 +39,7 @@ import androidx.test.filters.SmallTest; import com.android.dream.lowlight.LowLightTransitionCoordinator; import com.android.keyguard.BouncerPanelExpansionCalculator; import com.android.systemui.SysuiTestCase; -import com.android.systemui.dreams.complication.ComplicationHostViewController; +import com.android.systemui.complication.ComplicationHostViewController; import com.android.systemui.dreams.touch.scrim.BouncerlessScrimController; import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor; import com.android.systemui.keyguard.domain.interactor.PrimaryBouncerCallbackInteractor.PrimaryBouncerExpansionCallback; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java index ed737972e286c..cfd51e3901bde 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayServiceTest.java @@ -49,10 +49,10 @@ import androidx.test.filters.SmallTest; import com.android.internal.logging.UiEventLogger; import com.android.keyguard.KeyguardUpdateMonitor; import com.android.systemui.SysuiTestCase; -import com.android.systemui.dreams.complication.ComplicationLayoutEngine; +import com.android.systemui.complication.ComplicationLayoutEngine; +import com.android.systemui.dreams.complication.HideComplicationTouchHandler; import com.android.systemui.dreams.complication.dagger.ComplicationComponent; import com.android.systemui.dreams.dagger.DreamOverlayComponent; -import com.android.systemui.dreams.dreamcomplication.HideComplicationTouchHandler; import com.android.systemui.dreams.touch.DreamOverlayTouchMonitor; import com.android.systemui.touch.TouchInsetManager; import com.android.systemui.util.concurrency.FakeExecutor; @@ -98,21 +98,20 @@ public class DreamOverlayServiceTest extends SysuiTestCase { WindowManagerImpl mWindowManager; @Mock - ComplicationComponent.Factory mComplicationComponentFactory; + com.android.systemui.complication.dagger.ComplicationComponent.Factory + mComplicationComponentFactory; @Mock - ComplicationComponent mComplicationComponent; + com.android.systemui.complication.dagger.ComplicationComponent mComplicationComponent; @Mock ComplicationLayoutEngine mComplicationVisibilityController; @Mock - com.android.systemui.dreams.dreamcomplication.dagger.ComplicationComponent.Factory - mDreamComplicationComponentFactory; + ComplicationComponent.Factory mDreamComplicationComponentFactory; @Mock - com.android.systemui.dreams.dreamcomplication.dagger.ComplicationComponent - mDreamComplicationComponent; + ComplicationComponent mDreamComplicationComponent; @Mock HideComplicationTouchHandler mHideComplicationTouchHandler; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java index b88dbe6be856e..06f3aca8d38f7 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/DreamOverlayStateControllerTest.java @@ -31,7 +31,7 @@ import android.testing.AndroidTestingRunner; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; -import com.android.systemui.dreams.complication.Complication; +import com.android.systemui.complication.Complication; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.flags.Flags; import com.android.systemui.util.concurrency.FakeExecutor; diff --git a/packages/SystemUI/tests/src/com/android/systemui/dreams/dreamcomplication/HideComplicationTouchHandlerTest.java b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/HideComplicationTouchHandlerTest.java similarity index 98% rename from packages/SystemUI/tests/src/com/android/systemui/dreams/dreamcomplication/HideComplicationTouchHandlerTest.java rename to packages/SystemUI/tests/src/com/android/systemui/dreams/complication/HideComplicationTouchHandlerTest.java index d68f03246bf60..eed4dbcb77731 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/dreams/dreamcomplication/HideComplicationTouchHandlerTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/dreams/complication/HideComplicationTouchHandlerTest.java @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.android.systemui.dreams.dreamcomplication; +package com.android.systemui.dreams.complication; import static org.mockito.ArgumentMatchers.anyInt; import static org.mockito.ArgumentMatchers.eq; @@ -31,8 +31,8 @@ import androidx.concurrent.futures.CallbackToFutureAdapter; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.complication.Complication; import com.android.systemui.dreams.DreamOverlayStateController; -import com.android.systemui.dreams.complication.Complication; import com.android.systemui.dreams.touch.DreamTouchHandler; import com.android.systemui.shared.system.InputChannelCompat; import com.android.systemui.statusbar.phone.StatusBarKeyguardViewManager; diff --git a/packages/SystemUI/tests/src/com/android/systemui/media/dream/MediaDreamSentinelTest.java b/packages/SystemUI/tests/src/com/android/systemui/media/dream/MediaDreamSentinelTest.java index ed928a35a20e4..8a316642a3b01 100644 --- a/packages/SystemUI/tests/src/com/android/systemui/media/dream/MediaDreamSentinelTest.java +++ b/packages/SystemUI/tests/src/com/android/systemui/media/dream/MediaDreamSentinelTest.java @@ -30,8 +30,8 @@ import android.testing.AndroidTestingRunner; import androidx.test.filters.SmallTest; import com.android.systemui.SysuiTestCase; +import com.android.systemui.complication.DreamMediaEntryComplication; import com.android.systemui.dreams.DreamOverlayStateController; -import com.android.systemui.dreams.complication.DreamMediaEntryComplication; import com.android.systemui.flags.FeatureFlags; import com.android.systemui.media.controls.models.player.MediaData; import com.android.systemui.media.controls.pipeline.MediaDataManager;