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

Commit d41540f8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Dream Clock Complication font update" into main

parents 735fdefe e3fb8e64
Loading
Loading
Loading
Loading
+10 −0
Original line number Diff line number Diff line
@@ -1080,6 +1080,16 @@ flag {
  bug: "368053818"
}

flag {
    name: "dream_overlay_updated_font"
    namespace: "systemui"
    description: "Flag to enable updated font settings for dream overlay"
    bug: "349656117"
    metadata {
        purpose: PURPOSE_BUGFIX
    }
}

flag {
  name: "app_clips_backlinks"
  namespace: "systemui"
+8 −3
Original line number Diff line number Diff line
@@ -21,9 +21,10 @@ import android.view.LayoutInflater
import android.view.View
import android.widget.TextClock
import com.android.internal.util.Preconditions
import com.android.systemui.res.R
import com.android.systemui.Flags
import com.android.systemui.complication.DreamClockTimeComplication
import com.android.systemui.complication.DreamClockTimeComplication.DreamClockTimeViewHolder
import com.android.systemui.res.R
import dagger.Module
import dagger.Provides
import dagger.Subcomponent
@@ -71,9 +72,13 @@ interface DreamClockTimeComplicationComponent {
                            /* root = */ null,
                            /* attachToRoot = */ false,
                        ) as TextClock,
                        "R.layout.dream_overlay_complication_clock_time did not properly inflate"
                        "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
            }
        }