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

Commit 85341a76 authored by Adam Powell's avatar Adam Powell Committed by Android (Google) Code Review
Browse files

Merge "Fix keyguard dimensions; IME state for password view; layouts" into jb-mr1-dev

parents 211a18e2 70bc9f24

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

+2 −3
Original line number Diff line number Diff line
@@ -29,15 +29,14 @@ 


    <include layout="@layout/keyguard_widget_region"

        android:layout_width="match_parent"

        android:layout_height="0dip"

        android:layout_weight="27" />

        android:layout_height="153dp" />



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

        android:id="@+id/view_flipper"

        android:layout_height="0dp"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:layout_weight="73"

        android:layout_weight="1"

        android:paddingLeft="@dimen/keyguard_security_view_margin"

        android:paddingTop="@dimen/keyguard_security_view_margin"

        android:paddingRight="@dimen/keyguard_security_view_margin"

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

+0 −1
Original line number Diff line number Diff line
@@ -89,7 +89,6 @@ 
                    android:layout_weight="1"

                    android:gravity="center"

                    android:layout_gravity="center"

                    android:layout_marginStart="@dimen/keyguard_lockscreen_pin_margin_left"

                    android:singleLine="true"

                    android:textStyle="normal"

                    android:inputType="textPassword"

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

+0 −1
Original line number Diff line number Diff line
@@ -93,7 +93,6 @@ 
                    android:inputType="textPassword"

                    android:gravity="center"

                    android:layout_gravity="center"

                    android:layout_marginStart="@dimen/keyguard_lockscreen_pin_margin_left"

                    android:textSize="24sp"

                    android:textAppearance="?android:attr/textAppearanceMedium"

                    android:background="@null"

core/res/res/layout/keyguard_glow_pad_container.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,5 +22,5 @@ 
        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="bottom|center_horizontal"

        android:layout_marginBottom="-96dp"/>

        android:layout_marginBottom="-80dp"/>

</merge>
 
 No newline at end of file

core/res/res/layout/keyguard_password_view.xml

+11 −10
Original line number Diff line number Diff line
@@ -26,11 +26,12 @@ 


    <FrameLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_height="0dp"

        android:layout_weight="1">



        <LinearLayout

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_width="match_parent"

            android:orientation="vertical"

            android:layout_gravity="center">
@@ -114,7 +115,8 @@ 
                    android:clickable="true"

                />

            </LinearLayout>



        </LinearLayout>

    </FrameLayout>

    <include layout="@layout/keyguard_emergency_carrier_area"

             android:id="@+id/keyguard_selector_fade_container"

             android:layout_width="match_parent"
@@ -122,6 +124,5 @@ 
             android:orientation="vertical"

             android:layout_gravity="bottom|center_horizontal"

             android:gravity="center_horizontal" />

        </LinearLayout>

    </FrameLayout>



</com.android.internal.policy.impl.keyguard.KeyguardPasswordView>