Merge "Move the clock complication down on the dream overlay" into tm-qpr-dev (d97ae690) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/dreams/complication/dagger/RegisteredComplicationsModule.java

+12 −1

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