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

Commit 915f0eca authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android Git Automerger
Browse files

am 5499ea68: Merge "Visual refinements for lockscreen." into lmp-preview-dev 

* commit '5499ea6810b98109d3004e8a9a1493e2b0c2654f':
  Visual refinements for lockscreen.
parents dce826f7 37e65624

packages/Keyguard/res/layout/keyguard_status_view.xml

+1 −2
Original line number Diff line number Diff line
@@ -39,13 +39,12 @@ 
            android:id="@+id/clock_view"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal|top"

            android:layout_gravity="center_horizontal"

            android:textColor="@color/clock_white"

            android:singleLine="true"

            style="@style/widget_big_thin"

            android:format12Hour="@string/keyguard_widget_12_hours_format"

            android:format24Hour="@string/keyguard_widget_24_hours_format"

            android:baselineAligned="true"

            android:layout_marginBottom="@dimen/bottom_text_spacing_digital" />



        <include layout="@layout/keyguard_status_area" />

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

+0 −1
Original line number Diff line number Diff line
@@ -26,5 +26,4 @@ 


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

+1 −1
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ 
    <!-- Overload default clock widget parameters -->

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

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

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

    <dimen name="bottom_text_spacing_digital">-8dp</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/dimens.xml

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



    <!-- Default clock parameters -->

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

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

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

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

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

packages/Keyguard/res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -97,9 +97,9 @@ 
    <string name="keyguard_sim_unlock_progress_dialog_message">Unlocking SIM card\u2026</string>



    <!-- Time format strings for fall-back clock widget -->

    <string name="keyguard_widget_12_hours_format" translatable="false">h&#58;mm</string>

    <string name="keyguard_widget_12_hours_format" translatable="false">h\uee01mm</string>

    <!-- Time format strings for fall-back clock widget -->

    <string name="keyguard_widget_24_hours_format" translatable="false">kk&#58;mm</string>

    <string name="keyguard_widget_24_hours_format" translatable="false">kk\uee01mm</string>



    <!-- Accessibility description sent when user changes the current lock screen widget. [CHAR_LIMIT=none] -->

    <string name="keyguard_accessibility_widget_changed">%1$s. Widget %2$d of %3$d.</string>