From 4309caf99718a3c51d2d5a7987279aef06331fbd Mon Sep 17 00:00:00 2001 From: Prince Date: Tue, 14 Mar 2023 18:04:29 +0000 Subject: [PATCH] Move the clock complication down on the dream overlay Test: manual device testing Fixes: b/273294224 Change-Id: I50eccb1e8f39bac9fa5449a9de87fa85ecbd132e --- .../dagger/RegisteredComplicationsModule.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/RegisteredComplicationsModule.java b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/RegisteredComplicationsModule.java index 6808142e98d28..616bd81abe4d4 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/RegisteredComplicationsModule.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/RegisteredComplicationsModule.java @@ -23,6 +23,8 @@ import com.android.systemui.R; 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; @@ -47,6 +49,7 @@ public interface RegisteredComplicationsModule { String DREAM_MEDIA_ENTRY_LAYOUT_PARAMS = "media_entry_layout_params"; int DREAM_CLOCK_TIME_COMPLICATION_WEIGHT = 1; + int DREAM_CLOCK_TIME_COMPLICATION_WEIGHT_NO_SMARTSPACE = 2; int DREAM_SMARTSPACE_COMPLICATION_WEIGHT = 2; int DREAM_MEDIA_COMPLICATION_WEIGHT = 0; int DREAM_HOME_CONTROLS_CHIP_COMPLICATION_WEIGHT = 4; @@ -58,7 +61,15 @@ public interface RegisteredComplicationsModule { */ @Provides @Named(DREAM_CLOCK_TIME_COMPLICATION_LAYOUT_PARAMS) - static ComplicationLayoutParams provideClockTimeLayoutParams() { + static ComplicationLayoutParams provideClockTimeLayoutParams(FeatureFlags featureFlags) { + if (featureFlags.isEnabled(Flags.HIDE_SMARTSPACE_ON_DREAM_OVERLAY)) { + return new ComplicationLayoutParams(0, + ViewGroup.LayoutParams.WRAP_CONTENT, + ComplicationLayoutParams.POSITION_BOTTOM + | ComplicationLayoutParams.POSITION_START, + ComplicationLayoutParams.DIRECTION_END, + DREAM_CLOCK_TIME_COMPLICATION_WEIGHT_NO_SMARTSPACE); + } return new ComplicationLayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, ComplicationLayoutParams.POSITION_BOTTOM