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

Commit 29685c2f authored by Selim Cinek's avatar Selim Cinek Committed by Android (Google) Code Review
Browse files

Merge "Added dissapear animation to pattern and pin input" into lmp-mr1-dev

parents a816a075 f9c0e8f0

packages/Keyguard/res/layout-land/keyguard_host_view.xml

+5 −2
Original line number Original line Diff line number Diff line
@@ -25,14 +25,17 @@ 
    android:id="@+id/keyguard_host_view"

    android:id="@+id/keyguard_host_view"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal">

    android:orientation="horizontal"

    android:clipChildren="false"

    android:clipToPadding="false">





    <com.android.keyguard.MultiPaneChallengeLayout

    <com.android.keyguard.MultiPaneChallengeLayout

        android:id="@+id/multi_pane_challenge"

        android:id="@+id/multi_pane_challenge"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        android:orientation="horizontal"

        android:clipChildren="false">

        android:clipChildren="false"

        android:clipToPadding="false">





        <include layout="@layout/keyguard_widget_remove_drop_target"

        <include layout="@layout/keyguard_widget_remove_drop_target"

            android:id="@+id/keyguard_widget_pager_delete_target"

            android:id="@+id/keyguard_widget_pager_delete_target"

packages/Keyguard/res/layout-port/keyguard_host_view.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -26,13 +26,16 @@ 
    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:gravity="center_horizontal"

    android:gravity="center_horizontal"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:orientation="vertical">

    android:orientation="vertical">





    <com.android.keyguard.SlidingChallengeLayout

    <com.android.keyguard.SlidingChallengeLayout

        android:id="@+id/sliding_layout"

        android:id="@+id/sliding_layout"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:clipChildren="false">

        android:clipChildren="false"

        android:clipToPadding="false">





        <FrameLayout

        <FrameLayout

            android:layout_width="match_parent"

            android:layout_width="match_parent"

packages/Keyguard/res/layout-sw600dp-port/keyguard_host_view.xml

+4 −1
Original line number Original line Diff line number Diff line
@@ -25,13 +25,16 @@ 
    android:id="@+id/keyguard_host_view"

    android:id="@+id/keyguard_host_view"

    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal">

    android:orientation="horizontal"

    android:clipChildren="false"

    android:clipToPadding="false">





    <com.android.keyguard.MultiPaneChallengeLayout

    <com.android.keyguard.MultiPaneChallengeLayout

        android:id="@+id/multi_pane_challenge"

        android:id="@+id/multi_pane_challenge"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_height="match_parent"

        android:clipChildren="false"

        android:clipChildren="false"

        android:clipToPadding="false"

        android:orientation="vertical">

        android:orientation="vertical">





        <include layout="@layout/keyguard_widget_remove_drop_target"

        <include layout="@layout/keyguard_widget_remove_drop_target"

packages/Keyguard/res/layout/keyguard_bouncer.xml

+3 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,8 @@ 
    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:background="@android:color/transparent"

    android:background="@android:color/transparent"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:fitsSystemWindows="true">

    android:fitsSystemWindows="true">





    <include

    <include

packages/Keyguard/res/layout/keyguard_pattern_view.xml

+13 −3
Original line number Original line Diff line number Diff line
@@ -27,6 +27,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:clipChildren="false"

    android:clipToPadding="false"

    androidprv:layout_maxWidth="@dimen/keyguard_security_width"

    androidprv:layout_maxWidth="@dimen/keyguard_security_width"

    androidprv:layout_maxHeight="@dimen/keyguard_security_height"

    androidprv:layout_maxHeight="@dimen/keyguard_security_height"

    android:gravity="center_horizontal"

    android:gravity="center_horizontal"
@@ -34,13 +36,17 @@ 




    <FrameLayout

    <FrameLayout

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

        android:layout_height="match_parent"

        android:clipChildren="false"

        android:clipToPadding="false">





        <LinearLayout

        <LinearLayout

            android:layout_height="wrap_content"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"

            android:layout_width="wrap_content"

            android:orientation="vertical"

            android:orientation="vertical"

            android:layout_gravity="center_horizontal|bottom">

            android:layout_gravity="center_horizontal|bottom"

            android:clipChildren="false"

            android:clipToPadding="false">





            <include layout="@layout/keyguard_message_area"

            <include layout="@layout/keyguard_message_area"

                android:layout_width="match_parent"

                android:layout_width="match_parent"
@@ -52,6 +58,8 @@ 
             android:layout_width="match_parent"

             android:layout_width="match_parent"

             android:layout_height="0dp"

             android:layout_height="0dp"

             android:layout_weight="1"

             android:layout_weight="1"

             android:clipChildren="false"

             android:clipToPadding="false"

             >

             >

            <com.android.internal.widget.LockPatternView

            <com.android.internal.widget.LockPatternView

                android:id="@+id/lockPatternView"

                android:id="@+id/lockPatternView"
@@ -63,7 +71,9 @@ 
                android:layout_marginStart="8dip"

                android:layout_marginStart="8dip"

                android:layout_gravity="center_horizontal"

                android:layout_gravity="center_horizontal"

                android:gravity="center"

                android:gravity="center"

                android:contentDescription="@string/keyguard_accessibility_pattern_area" />

                android:contentDescription="@string/keyguard_accessibility_pattern_area"

                android:clipChildren="false"

                android:clipToPadding="false" />

          </FrameLayout>

          </FrameLayout>

          <include layout="@layout/keyguard_eca"

          <include layout="@layout/keyguard_eca"

              android:id="@+id/keyguard_selector_fade_container"

              android:id="@+id/keyguard_selector_fade_container"