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

Commit af6edfcd authored by Nick Ning's avatar Nick Ning Committed by Android (Google) Code Review
Browse files

Merge "Use system clock font for dream clock."

parents 9e6e09c0 6d0af956
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:paddingLeft="@dimen/dream_overlay_complication_clock_time_padding_left"
    android:fontFamily="sans-serif-thin"
    android:fontFamily="@font/clock"
    android:textColor="@android:color/white"
    android:format12Hour="h:mm"
    android:format24Hour="kk:mm"
+8 −3
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ import static java.lang.annotation.RetentionPolicy.RUNTIME;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextClock;

import com.android.internal.util.Preconditions;
import com.android.systemui.R;
@@ -78,6 +79,8 @@ public interface DreamClockTimeComplicationComponent {
                "clock_time_complication_layout_params";
        // Order weight of insert into parent container
        int INSERT_ORDER_WEIGHT = 0;
        String TAG_WEIGHT = "'wght' ";
        int WEIGHT = 200;

        /**
         * Provides the complication view.
@@ -86,10 +89,12 @@ public interface DreamClockTimeComplicationComponent {
        @DreamClockTimeComplicationScope
        @Named(DREAM_CLOCK_TIME_COMPLICATION_VIEW)
        static View provideComplicationView(LayoutInflater layoutInflater) {
            return Preconditions.checkNotNull(
            final TextClock view = Preconditions.checkNotNull((TextClock)
                            layoutInflater.inflate(R.layout.dream_overlay_complication_clock_time,
                                    null, false),
                    "R.layout.dream_overlay_complication_clock_time did not properly inflated");
            view.setFontVariationSettings(TAG_WEIGHT + WEIGHT);
            return view;
        }

        /**