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

Commit 057df3a5 authored by Hawkwood Glazier's avatar Hawkwood Glazier
Browse files

Migrate shared dimens to customization resources 

This also fixes an issue where certain dimensions weren't properly
overlaid in the wpp on certain devices. This caused a layout issue
in certain previews.

Bug: 282758655
Test: Manually checked layout on many devices
Change-Id: I9a2ab82b64407624a64374b50987e84b7794ef24
parent 21d1cb3d

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -123,6 +123,7 @@ android_library { 
    ],

    static_libs: [

        "SystemUISharedLib",

        "SystemUICustomizationLib",

        "SettingsLib",

        "androidx.leanback_leanback",

        "androidx.slice_slice-core",

packages/SystemUI/customization/res/values-h800dp/dimens.xml

+3 −0
Original line number Diff line number Diff line
@@ -17,4 +17,7 @@ 
<resources>

    <!-- Large clock maximum font size (dp is intentional, to prevent any further scaling) -->

    <dimen name="large_clock_text_size">200dp</dimen>



    <!-- With the large clock, move up slightly from the center -->

    <dimen name="keyguard_large_clock_top_margin">-112dp</dimen>

</resources>

packages/SystemUI/customization/res/values/dimens.xml

+8 −0
Original line number Diff line number Diff line
@@ -24,4 +24,12 @@ 
    <item name="keyguard_clock_line_spacing_scale" type="dimen" format="float">.7</item>

    <!-- Burmese line spacing multiplier between hours and minutes of the keyguard clock -->

    <item name="keyguard_clock_line_spacing_scale_burmese" type="dimen" format="float">1</item>



    <!-- With the large clock, move up slightly from the center -->

    <dimen name="keyguard_large_clock_top_margin">-60dp</dimen>



    <!-- additional offset for clock switch area items -->

    <dimen name="small_clock_height">114dp</dimen>

    <dimen name="small_clock_padding_top">28dp</dimen>

    <dimen name="clock_padding_start">28dp</dimen>

</resources>
 
 No newline at end of file

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

+0 −3
Original line number Diff line number Diff line
@@ -95,9 +95,6 @@ 
    <dimen name="num_pad_key_margin_end">12dp</dimen>



    <!-- additional offset for clock switch area items -->

    <dimen name="small_clock_height">114dp</dimen>

    <dimen name="small_clock_padding_top">28dp</dimen>

    <dimen name="clock_padding_start">28dp</dimen>

    <dimen name="below_clock_padding_start">32dp</dimen>

    <dimen name="below_clock_padding_end">16dp</dimen>

    <dimen name="below_clock_padding_start_icons">28dp</dimen>

packages/SystemUI/res/values-h800dp/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
  -->



<resources>

    <!-- With the large clock, move up slightly from the center -->

    <dimen name="keyguard_large_clock_top_margin">-112dp</dimen>



    <!-- Margin above the ambient indication container -->

    <dimen name="ambient_indication_container_margin_top">20dp</dimen>

</resources>