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

Commit eaa0cc8a authored by Adam Powell's avatar Adam Powell Committed by Android Git Automerger
Browse files

am c4e0614b: am e7394d1e: am 3c0a353a: am 9799714f: Keyguard layout tweaking/reworking 

* commit 'c4e0614b':
  Keyguard layout tweaking/reworking
parents 2a08223f c4e0614b

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -56,8 +56,8 @@ 




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

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

            android:id="@+id/keyguard_security_container"

            android:id="@+id/keyguard_security_container"

            android:layout_width="@dimen/keyguard_security_width"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/keyguard_security_height"

            android:layout_height="wrap_content"

            androidprv:layout_childType="challenge"

            androidprv:layout_childType="challenge"

            androidprv:layout_centerWithinArea="0.55">

            androidprv:layout_centerWithinArea="0.55">

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

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

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,8 @@ 
        <com.android.internal.policy.impl.keyguard.KeyguardSecurityContainer

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

            android:id="@+id/keyguard_security_container"

            android:id="@+id/keyguard_security_container"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:layout_height="@dimen/keyguard_security_height"

            android:layout_height="wrap_content"

            android:layout_maxHeight="@dimen/keyguard_security_height"

            androidprv:layout_childType="challenge"

            androidprv:layout_childType="challenge"

            android:padding="0dp"

            android:padding="0dp"

            android:gravity="bottom|center_horizontal">

            android:gravity="bottom|center_horizontal">

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

+2 −4
Original line number Original line Diff line number Diff line
@@ -58,10 +58,8 @@ 




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

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

            android:id="@+id/keyguard_security_container"

            android:id="@+id/keyguard_security_container"

            android:layout_width="match_parent"

            android:layout_width="wrap_content"

            android:layout_height="match_parent"

            android:layout_height="wrap_content"

            androidprv:layout_maxWidth="@dimen/keyguard_security_width"

            androidprv:layout_maxHeight="@dimen/keyguard_security_height"

            androidprv:layout_centerWithinArea="0.5"

            androidprv:layout_centerWithinArea="0.5"

            androidprv:layout_childType="challenge"

            androidprv:layout_childType="challenge"

            android:layout_gravity="center_horizontal|bottom">

            android:layout_gravity="center_horizontal|bottom">

core/res/res/layout/keyguard_account_view.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -21,6 +21,8 @@ 
    android:id="@+id/keyguard_account_view"

    android:id="@+id/keyguard_account_view"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:layout_maxWidth="@dimen/keyguard_security_width"

    android:layout_maxHeight="@dimen/keyguard_security_height"

    android:orientation="vertical">

    android:orientation="vertical">





    <include layout="@layout/keyguard_message_area"

    <include layout="@layout/keyguard_message_area"

core/res/res/layout/keyguard_face_unlock_view.xml

+2 −0
Original line number Original line Diff line number Diff line
@@ -24,6 +24,8 @@ 
    android:orientation="vertical"

    android:orientation="vertical"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:layout_maxWidth="@dimen/keyguard_security_width"

    android:layout_maxHeight="@dimen/keyguard_security_height"

    android:contentDescription="@string/keyguard_accessibility_face_unlock">

    android:contentDescription="@string/keyguard_accessibility_face_unlock">





    <include layout="@layout/keyguard_message_area"

    <include layout="@layout/keyguard_message_area"