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

Commit 6649bbc5 authored by William Leshner's avatar William Leshner Committed by Android (Google) Code Review
Browse files

Merge "Update fonts for weather and clock on dream overlay." into main

parents 860cdd90 80f52b5f

packages/SystemUI/aconfig/systemui.aconfig

+8 −0
Original line number Diff line number Diff line
@@ -1334,6 +1334,14 @@ flag { 
    }

}



flag {

    name: "dream_overlay_updated_ui"

    namespace: "systemui"

    description: "Flag to enable updated UI for dream overlay"

    bug: "368587927"

    is_fixed_read_only: true

}



flag {

  name: "app_clips_backlinks"

  namespace: "systemui"

packages/SystemUI/res/layout/dream_overlay_complication_clock_time.xml

+1 −7
Original line number Diff line number Diff line
@@ -19,15 +19,9 @@ 
    xmlns:app="http://schemas.android.com/apk/res-auto"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:fontFamily="@*android:string/config_clockFontFamily"

    android:textColor="@android:color/white"

    style="@style/DreamOverlayComplicationClockTextStyle"

    android:format12Hour="@string/dream_time_complication_12_hr_time_format"

    android:format24Hour="@string/dream_time_complication_24_hr_time_format"

    android:fontFeatureSettings="pnum, lnum"

    android:includeFontPadding="false"

    android:letterSpacing="0.02"

    android:maxLines="1"

    android:textSize="@dimen/dream_overlay_complication_clock_time_text_size"

    app:keyShadowBlur="@dimen/dream_overlay_clock_key_text_shadow_radius"

    app:keyShadowOffsetX="@dimen/dream_overlay_clock_key_text_shadow_dx"

    app:keyShadowOffsetY="@dimen/dream_overlay_clock_key_text_shadow_dy"

packages/SystemUI/res/values/styles.xml

+13 −0
Original line number Diff line number Diff line
@@ -1542,6 +1542,19 @@ 
        <item name="android:shadowRadius">?attr/shadowRadius</item>

    </style>



    <style name="DreamOverlayComplicationClockTextStyle">

        <item name="android:fontFamily" android:featureFlag="!com.android.systemui.dream_overlay_updated_ui">@*android:string/config_clockFontFamily</item>

        <item name="android:fontFamily" android:featureFlag="com.android.systemui.dream_overlay_updated_ui">google-sans-flex</item>

        <item name="android:textColor">@android:color/white</item>

        <item name="android:fontFeatureSettings">pnum, lnum</item>

        <item name="android:includeFontPadding">false</item>

        <item name="android:letterSpacing">0.02</item>

        <item name="android:maxLines">1</item>

        <item name="android:textSize">@dimen/dream_overlay_complication_clock_time_text_size</item>

        <item name="android:fontVariationSettings" android:featureFlag="!com.android.systemui.dream_overlay_updated_ui">"'wght' 400"</item>

        <item name="android:fontVariationSettings" android:featureFlag="com.android.systemui.dream_overlay_updated_ui">"'wght' 600, 'opsz' 96"</item>

    </style>



    <style name="BroadcastDialogTitleStyle">

        <item name="android:textAppearance">@style/TextAppearanceBroadcastDialogTitle</item>

        <item name="android:layout_marginStart">@dimen/broadcast_dialog_title_text_margin</item>

packages/SystemUI/src/com/android/systemui/complication/dagger/DreamClockTimeComplicationComponent.kt

+1 −8
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ package com.android.systemui.complication.dagger 
import android.view.LayoutInflater

import android.widget.TextClock

import com.android.internal.util.Preconditions

import com.android.systemui.Flags

import com.android.systemui.complication.DreamClockTimeComplication

import com.android.systemui.complication.DreamClockTimeComplication.DreamClockTimeViewHolder

import com.android.systemui.res.R
@@ -56,8 +55,6 @@ interface DreamClockTimeComplicationComponent { 
    interface DreamClockTimeComplicationModule {

        companion object {

            const val DREAM_CLOCK_TIME_COMPLICATION_VIEW = "clock_time_complication_view"

            private const val TAG_WEIGHT = "'wght' "

            private const val WEIGHT = 400



            /** Provides the complication view. */

            @Provides
@@ -73,11 +70,7 @@ interface DreamClockTimeComplicationComponent { 
                        ) as TextClock,

                        "R.layout.dream_overlay_complication_clock_time did not properly inflate",

                    )

                if (Flags.dreamOverlayUpdatedFont()) {

                    view.setFontVariationSettings("'wght' 600, 'opsz' 96")

                } else {

                    view.setFontVariationSettings(TAG_WEIGHT + WEIGHT)

                }



                return view

            }

        }