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

Commit 067b543f authored by Lucas Dupin's avatar Lucas Dupin Committed by Android (Google) Code Review
Browse files

Merge "Add padlock to the top of the bouncer"

parents e7f50e16 407cc586
Loading
Loading
Loading
Loading
+21 −12
Original line number Diff line number Diff line
@@ -17,15 +17,24 @@
*/
-->

<!-- This contains emergency call button and carrier as shared by pin/pattern/password screens -->
<!-- This contains error message field and padlock shared by pin/pattern/password screens -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
              android:orientation="vertical"
              android:layout_width="match_parent"
              android:layout_height="wrap_content" >
    <FrameLayout
        android:id="@+id/lock_icon_container"
        android:layout_gravity="center"
        android:layout_marginBottom="@dimen/keyguard_lock_padding"
        android:layout_width="@dimen/keyguard_lock_width"
        android:layout_height="@dimen/keyguard_lock_height" />
    <com.android.keyguard.KeyguardMessageArea
    xmlns:android="http://schemas.android.com/apk/res/android"
        android:id="@+id/keyguard_message_area"
        style="@style/Keyguard.TextView"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:gravity="center"
    style="@style/Keyguard.TextView"
    android:id="@+id/keyguard_message_area"
        android:singleLine="true"
        android:ellipsize="marquee"
        android:focusable="true" />
</LinearLayout>
 No newline at end of file
+1 −1
Original line number Diff line number Diff line
@@ -21,6 +21,6 @@

    <!-- Height of the sliding KeyguardSecurityContainer
         (includes 2x keyguard_security_view_top_margin) -->
    <dimen name="keyguard_security_height">345dp</dimen>
    <dimen name="keyguard_security_height">395dp</dimen>

</resources>
+1 −1
Original line number Diff line number Diff line
@@ -21,5 +21,5 @@

    <!-- Height of the sliding KeyguardSecurityContainer (includes 2x
         keyguard_security_view_top_margin) -->
    <dimen name="keyguard_security_height">400dp</dimen>
    <dimen name="keyguard_security_height">450dp</dimen>
</resources>
+1 −1
Original line number Diff line number Diff line
@@ -20,5 +20,5 @@
<resources>
    <!-- Height of the sliding KeyguardSecurityContainer
        (includes 2x keyguard_security_view_top_margin) -->
    <dimen name="keyguard_security_height">500dp</dimen>
    <dimen name="keyguard_security_height">550dp</dimen>
</resources>
+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@

    <!-- Height of the sliding KeyguardSecurityContainer
         (includes 2x keyguard_security_view_top_margin) -->
    <dimen name="keyguard_security_height">420dp</dimen>
    <dimen name="keyguard_security_height">470dp</dimen>

    <dimen name="widget_big_font_size">100dp</dimen>
</resources>
Loading