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

Commit 25c82e6c authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 5233681,5230897: Minor tweaks to lockscreen layout on tablets."

parents d49eea78 2227acd7

core/res/res/layout-sw600dp/keyguard_screen_status_land.xml

+0 −3
Original line number Original line Diff line number Diff line
@@ -42,11 +42,8 @@ 
    <com.android.internal.widget.DigitalClock android:id="@+id/time"

    <com.android.internal.widget.DigitalClock android:id="@+id/time"

        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_alignParentLeft="true"

        android:layout_marginTop="8dip"

        android:layout_marginTop="8dip"

        android:layout_marginBottom="8dip"

        android:layout_marginBottom="8dip"

        android:layout_marginLeft="-10dip"

        >

        >





        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on

        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on

core/res/res/layout-sw600dp/keyguard_screen_status_port.xml

+1 −2
Original line number Original line Diff line number Diff line
@@ -45,8 +45,7 @@ 
        android:layout_width="wrap_content"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginTop="8dip"

        android:layout_marginTop="8dip"

        android:layout_marginBottom="8dip"

        android:layout_marginBottom="8dip">

        android_layout_marginLeft="-10dip">





        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on

        <!-- Because we can't have multi-tone fonts, we render two TextViews, one on

        top of the other. Hence the redundant layout... -->

        top of the other. Hence the redundant layout... -->

core/res/res/values-sw600dp/colors.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -21,7 +21,7 @@ 
    <!-- keyguard clock -->

    <!-- keyguard clock -->

    <color name="lockscreen_clock_background">#b3ffffff</color>

    <color name="lockscreen_clock_background">#b3ffffff</color>

    <color name="lockscreen_clock_foreground">#7affffff</color>

    <color name="lockscreen_clock_foreground">#7affffff</color>

    <color name="lockscreen_clock_am_pm">#ff9a9a9a</color>

    <color name="lockscreen_clock_am_pm">#ffffffff</color>

    <color name="lockscreen_owner_info">#ff9a9a9a</color>

    <color name="lockscreen_owner_info">#ff9a9a9a</color>





</resources>

</resources>