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

Commit ca9279ee authored by Justin Weir's avatar Justin Weir Committed by Android (Google) Code Review
Browse files

Merge "Split color out of the shade header font update flag" into main

parents 417f3f87 07a8472e

packages/SystemUI/aconfig/systemui.aconfig

+11 −0
Original line number Diff line number Diff line
@@ -1693,6 +1693,17 @@ flag { 
  is_fixed_read_only: true

}



flag {

  name: "shade_header_blur_font_color"

  namespace: "systemui"

  description: "Updates the font colors of the shade header for blur"

  bug: "393609960"

  is_fixed_read_only: true

  metadata {

    purpose: PURPOSE_BUGFIX

  }

}



flag {

    name: "keyboard_shortcut_helper_shortcut_customizer"

    namespace: "systemui"

packages/SystemUI/res/values/styles.xml

+2 −2
Original line number Diff line number Diff line
@@ -184,8 +184,8 @@ 
    <style name="TextAppearance.QS.Status">

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

        <item name="android:fontFamily" android:featureFlag="com.android.systemui.shade_header_font_update">variable-body-medium-emphasized</item>

        <item name="android:textColor" android:featureFlag="!com.android.systemui.shade_header_font_update">@color/shade_header_text_color</item>

        <item name="android:textColor" android:featureFlag="com.android.systemui.shade_header_font_update">@androidprv:color/materialColorOnSurface</item>

        <item name="android:textColor" android:featureFlag="!com.android.systemui.shade_header_blur_font_color">@color/shade_header_text_color</item>

        <item name="android:textColor" android:featureFlag="com.android.systemui.shade_header_blur_font_color">@androidprv:color/materialColorOnSurface</item>

        <item name="android:textSize">14sp</item>

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

    </style>