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

Commit 9c1c33b9 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am fcb34c59: Merge "Adjust lockscreen style to spec" into mnc-dev 

* commit 'fcb34c59':
  Adjust lockscreen style to spec
parents 52bb6c26 fcb34c59

packages/Keyguard/res/layout/keyguard_status_area.xml

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,8 @@ 
        android:layout_height="wrap_content"

        android:textColor="@color/clock_white"

        style="@style/widget_label"

        android:textAllCaps="true"

        android:letterSpacing="0.15"

        android:gravity="center"

        />

    <TextView android:id="@+id/alarm_status"
@@ -38,6 +40,8 @@ 
        android:drawablePadding="6dp"

        android:drawableStart="@drawable/ic_access_alarms_big"

        android:textColor="@color/clock_gray"

        android:letterSpacing="0.15"

        android:textAllCaps="true"

        style="@style/widget_label"

        android:layout_marginStart="6dp"

        android:gravity="center"

packages/Keyguard/res/layout/keyguard_status_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ 
            android:layout_gravity="center_horizontal"

            android:textColor="@color/clock_gray"

            android:textSize="@dimen/widget_label_font_size"

            android:letterSpacing="0.05"

            android:ellipsize="marquee"

            android:singleLine="true" />

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

+1 −1
Original line number Diff line number Diff line
@@ -16,5 +16,5 @@ 
  -->



<resources>

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

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

</resources>
 
 No newline at end of file

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

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <dimen name="keyguard_security_view_margin">12dp</dimen>



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

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

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

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

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

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

+1 −1
Original line number Diff line number Diff line
@@ -24,5 +24,5 @@ 
    <!-- Height of the sliding KeyguardSecurityContainer (includes 2x keyguard_security_view_margin) -->

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



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

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

</resources>