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

Commit 069cd037 authored by Jorim Jaggi's avatar Jorim Jaggi
Browse files

Position clock and notifications dynamically. 

The positioning is dependant on how many notifications are currently
showing. This makes sure that the lockscreen always looks balanced
and harmonic.

Bug: 14592994
Change-Id: Ic647b887dd23e6cc5ecd07d70f279ff2f218f4ca
parent c5baa188

packages/Keyguard/res/layout/keyguard_status_view.xml

+0 −2
Original line number Diff line number Diff line
@@ -28,8 +28,6 @@ 
    androidprv:layout_maxWidth="@dimen/keyguard_security_width"

    androidprv:layout_maxHeight="@dimen/keyguard_security_height"

    android:gravity="center_horizontal|top"

    android:layout_marginTop="48dp"

    android:layout_marginBottom="32dp"

    android:contentDescription="@string/keyguard_accessibility_status">

    <LinearLayout

        android:layout_width="match_parent"

packages/Keyguard/res/values-sw600dp-land/dimens.xml

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


    <!-- Size of margin on the right of keyguard's status view -->

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



    <!-- Overload default clock widget parameters -->

    <dimen name="widget_big_font_size">88dp</dimen>

    <dimen name="bottom_text_spacing_digital">-24dp</dimen>

</resources>
 
 No newline at end of file

packages/Keyguard/res/values-sw600dp/dimens.xml

+3 −2
Original line number Diff line number Diff line
@@ -63,8 +63,9 @@ 
    <dimen name="keyguard_muliuser_selector_margin">12dp</dimen>



    <!-- Overload default clock widget parameters -->

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

    <dimen name="widget_big_font_size">141dp</dimen>

    <dimen name="widget_big_font_size">96dp</dimen>

    <dimen name="widget_label_font_size">16sp</dimen>

    <dimen name="bottom_text_spacing_digital">-24dp</dimen>



    <!-- EmergencyCarrierArea overlap - amount to overlap the emergency button and carrier text.

         Should be 0 on devices with plenty of room (e.g. tablets) -->

packages/Keyguard/res/values-sw720dp/dimens.xml

+0 −3
Original line number Diff line number Diff line
@@ -61,7 +61,4 @@ 
    <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->

    <dimen name="keyguard_security_height">420dp</dimen>



    <!-- Default clock parameters -->

    <dimen name="widget_label_font_size">19dp</dimen>



</resources>

packages/Keyguard/res/values/dimens.xml

+3 −3
Original line number Diff line number Diff line
@@ -155,10 +155,10 @@ 
    <dimen name="eca_overlap">-10dip</dimen>



    <!-- Default clock parameters -->

    <dimen name="bottom_text_spacing_digital">-8dp</dimen>

    <dimen name="bottom_text_spacing_digital">-18dp</dimen>

    <dimen name="label_font_size">14dp</dimen>

    <dimen name="widget_label_font_size">14dp</dimen>

    <dimen name="widget_big_font_size">60dp</dimen>

    <dimen name="widget_label_font_size">14sp</dimen>

    <dimen name="widget_big_font_size">68dp</dimen>

    <dimen name="big_font_size">120dp</dimen>



</resources>