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

Commit fec8092b authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

Update lockscreen to use config_headlineFontFamilyLight 

Allows OEMs to update the font family that's used for various places in
lockscreen (clock, num pad, and PIN password text). Also updates the
various text sizes to new numbers.

Fixes: 62411304
Fixes: 62411119
Test: ag/2430512 and manual verification
Change-Id: I3ecd1b18bbefe61c6a9cc5f549966ecd71858c9c
parent ae448fbf

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -2968,6 +2968,8 @@ 


    <!-- 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>



    <!-- An array of packages that need to be treated as type system in battery settings -->

    <string-array translatable="false" name="config_batteryPackageTypeSystem">

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -3041,6 +3041,7 @@ 
  <java-symbol type="bool" name="config_dozeAlwaysOnDisplayAvailable" />

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

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

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



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

packages/SystemUI/res-keyguard/layout/keyguard_pin_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ 
                    android:gravity="center"

                    android:layout_centerHorizontal="true"

                    android:layout_marginRight="72dp"

                    androidprv:scaledTextSize="28"

                    androidprv:scaledTextSize="@integer/scaled_password_text_size"

                    android:textColor="?attr/bgProtectTextColor"

                    android:contentDescription="@string/keyguard_accessibility_pin_area"

                    />

packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ 
                    android:gravity="center"

                    android:layout_centerHorizontal="true"

                    android:layout_marginRight="72dp"

                    androidprv:scaledTextSize="28"

                    androidprv:scaledTextSize="@integer/scaled_password_text_size"

                    android:textColor="?attr/bgProtectTextColor"

                    android:contentDescription="@string/keyguard_accessibility_sim_pin_area"

                    />

packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml

+1 −1
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 
                    android:gravity="center"

                    android:layout_centerHorizontal="true"

                    android:layout_marginRight="72dp"

                    androidprv:scaledTextSize="28"

                    androidprv:scaledTextSize="@integer/scaled_password_text_size"

                    android:textColor="?attr/bgProtectTextColor"

                    android:contentDescription="@string/keyguard_accessibility_sim_puk_area"

                    />