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

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

Merge "Fix missing layout parameters in keyguard." into jb-mr1-dev

parents de5c3a04 bdffd5c3

core/res/res/layout-port/keyguard_host_view.xml

+2 −1
Original line number Diff line number Diff line
@@ -33,7 +33,8 @@ 


    <com.android.internal.policy.impl.keyguard.KeyguardSecurityViewFlipper

        android:id="@+id/view_flipper"

        android:layout_height="0dp"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:layout_weight="1"

core/res/res/layout-port/keyguard_status_area.xml

+3 −1
Original line number Diff line number Diff line
@@ -45,6 +45,8 @@ 


        <TextView

            android:id="@+id/alarm_status"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_marginEnd="@dimen/kg_status_line_font_right_margin"

            android:singleLine="true"

            android:ellipsize="marquee"

core/res/res/layout/default_navigation.xml

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ 
-->

<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/keyguard_click_area"

    android:layout_width="wrap_content"

    android:layout_height="wrap_content"

    android:gravity="center">



    <!-- message area for security screen -->

core/res/res/layout/keyguard_password_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
                     since the backspace/IME switcher looks better inside -->

                <LinearLayout

                    android:layout_gravity="center_vertical|fill_horizontal"

                    android:layout_height="wrap_content"

                    android:layout_width="match_parent"

                    android:orientation="horizontal"

                    android:background="#70000000"

core/res/res/layout/keyguard_sim_pin_view.xml

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ 
        <!-- Numeric keyboard -->

        <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginStart="4dip"

            android:layout_marginEnd="4dip"

            android:paddingTop="4dip"