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

Commit 57b17f50 authored by Ben Komalo's avatar Ben Komalo Committed by Android (Google) Code Review
Browse files

Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2

parents 3a5b3494 a1d57709

res/layout-sw600dp-land/crypt_keeper_password_entry.xml

+9 −9
Original line number Diff line number Diff line
@@ -16,20 +16,21 @@ 
** limitations under the License.

*/

-->

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

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

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

>

    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerHorizontal="true"

        android:layout_marginTop="206dip"

        android:layout_height="0dip"

        android:layout_weight="1"

        android:layout_gravity="center_horizontal"

    >

        <ImageView android:id="@+id/encroid"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_alignParentTop="true"

            android:layout_centerVertical="true"

            android:src="@drawable/encroid_resignin"

        />
@@ -37,7 +38,7 @@ 
            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_toRightOf="@+id/encroid"

            android:layout_marginTop="37dip"

            android:layout_centerVertical="true"

            android:paddingRight="17dip"

            android:singleLine="true"

            android:textAppearance="?android:attr/textAppearanceMedium"
@@ -51,7 +52,7 @@ 
            android:layout_height="wrap_content"

            android:layout_width="320dip"

            android:layout_toRightOf="@+id/passwordLabel"

            android:layout_marginTop="26dip"

            android:layout_centerVertical="true"

            android:singleLine="true"

            android:inputType="textPassword"

            android:textAppearance="?android:attr/textAppearanceMedium"
@@ -75,10 +76,9 @@ 
    <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:background="#00000000"

        android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"

        android:visibility="visible"

    />



</RelativeLayout>
 
 No newline at end of file
 
</LinearLayout>

res/layout-sw600dp/crypt_keeper_progress.xml

+72 −70
Original line number Diff line number Diff line
@@ -14,16 +14,16 @@ 
     limitations under the License.

  -->



<RelativeLayout

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="154dip"

    android:paddingLeft="128dip"

    android:paddingRight="128dip"

    android:paddingBottom="16dip"

>



    <RelativeLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center"

    >

        <ImageView

            android:id="@+id/encroid"

            android:layout_width="wrap_content"
@@ -99,4 +99,6 @@ 
            android:text="@string/master_clear_button_text"

            android:visibility="gone"

        />



    </RelativeLayout>

</FrameLayout>