From 3b098ee87982a17fe2629f0d998586ee3038470d Mon Sep 17 00:00:00 2001 From: Bryce Lee Date: Wed, 2 Feb 2022 23:15:25 -0800 Subject: [PATCH] Adjust Smartspace and Media complication positions. This changelist revises the locations of these two complications. Bug: 217661151 Test: manual Change-Id: Ia6d4387e1d1eee53e38410a35473bcb42a10e41f --- .../com/android/systemui/dreams/SmartSpaceComplication.java | 3 ++- .../media/dream/dagger/MediaComplicationComponent.java | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java b/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java index 09221b4f810a2..240389a988aea 100644 --- a/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java +++ b/packages/SystemUI/src/com/android/systemui/dreams/SmartSpaceComplication.java @@ -66,6 +66,7 @@ public class SmartSpaceComplication implements Complication { } private static class SmartSpaceComplicationViewHolder implements ViewHolder { + private static final int SMARTSPACE_COMPLICATION_WEIGHT = 10; private final LockscreenSmartspaceController mSmartSpaceController; private final Context mContext; @@ -92,7 +93,7 @@ public class SmartSpaceComplication implements Complication { return new ComplicationLayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, ComplicationLayoutParams.POSITION_TOP | ComplicationLayoutParams.POSITION_START, ComplicationLayoutParams.DIRECTION_DOWN, - 0, true); + SMARTSPACE_COMPLICATION_WEIGHT, true); } } 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 3372899b8fd7a..3408d97dd33ff 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 @@ -90,9 +90,9 @@ public interface MediaComplicationComponent { static ComplicationLayoutParams provideLayoutParams() { return new ComplicationLayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, - ComplicationLayoutParams.POSITION_BOTTOM - | ComplicationLayoutParams.POSITION_END, - ComplicationLayoutParams.DIRECTION_UP, + ComplicationLayoutParams.POSITION_TOP + | ComplicationLayoutParams.POSITION_START, + ComplicationLayoutParams.DIRECTION_DOWN, 0, true); }