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

Commit 964d112c authored by Fabian Kozynski's avatar Fabian Kozynski Committed by Android (Google) Code Review
Browse files

Merge "Remove config_{body,headline}FontFamilyLight"

parents 2ec8b910 96b1636f

core/res/res/values/config.xml

+0 −4
Original line number Diff line number Diff line
@@ -3492,8 +3492,6 @@ 


    <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->

    <string name="config_headlineFontFamily" translatable="false"></string>

    <!-- Name of a font family to use for headlines. Defaults to sans-serif-light -->

    <string name="config_headlineFontFamilyLight" translatable="false">sans-serif-light</string>

    <!-- Allows setting custom fontFeatureSettings on specific text. -->

    <string name="config_headlineFontFeatureSettings" translatable="false"></string>
@@ -3560,8 +3558,6 @@ 
    <string name="config_headlineFontFamilyMedium" translateable="false">@string/font_family_button_material</string>

    <!-- Name of a font family to use for body text. -->

    <string name="config_bodyFontFamily" translatable="false">sans-serif</string>

    <!-- Name of a font family to use for light body text. -->

    <string name="config_bodyFontFamilyLight" translatable="false">sans-serif-light</string>

    <!-- Name of a font family to use for medium body text. -->

    <string name="config_bodyFontFamilyMedium" translatable="false">sans-serif-medium</string>

core/res/res/values/symbols.xml

+0 −2
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

/* Copyright 2012, The Android Open Source Project

**
@@ -3328,7 +3327,6 @@ 
  <java-symbol type="bool" name="config_displayBrightnessBucketsInDoze" />

  <java-symbol type="integer" name="config_storageManagerDaystoRetainDefault" />

  <java-symbol type="string" name="config_headlineFontFamily" />

  <java-symbol type="string" name="config_headlineFontFamilyLight" />

  <java-symbol type="string" name="config_headlineFontFamilyMedium" />



  <java-symbol type="drawable" name="stat_sys_vitals" />

packages/SystemUI/res-keyguard/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
        <item name="android:gravity">center_horizontal|center_vertical</item>

        <item name="android:background">@null</item>

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

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyLight</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

        <item name="android:textColor">?attr/wallpaperTextColor</item>

        <item name="android:paddingBottom">-16dp</item>

    </style>