Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f8b5091d authored by Prince Donkor's avatar Prince Donkor Committed by Automerger Merge Worker
Browse files

Merge "Move the clock complication down on the dream overlay" into tm-qpr-dev... 

Merge "Move the clock complication down on the dream overlay" into tm-qpr-dev am: d97ae690 am: b25fa50c am: 722e63a5

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22074394



Change-Id: Ic8f565df8df1e8ac87fdeef4e57028c2eed5ca16
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents ca984819 722e63a5

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