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

Commit 3decc865 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "No autofill password when in PIN settings" into oc-dev

parents 4bce1569 1c78242a

res/layout-land/confirm_lock_password.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent" >

    android:layout_height="match_parent"

    android:importantForAutofill="noExcludeDescendants">



    <include layout="@layout/confirm_lock_background_base" />

res/layout-sw600dp/confirm_lock_password.xml

+7 −4
Original line number Diff line number Diff line
@@ -14,11 +14,14 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License

  -->

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

<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:importantForAutofill="noExcludeDescendants">



    <include layout="@layout/confirm_lock_password_base"

    <include

        layout="@layout/confirm_lock_password_base"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center_horizontal" />

res/layout/confirm_lock_password_base.xml

+2 −1
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 
<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent" >

    android:layout_height="match_parent"

    android:importantForAutofill="noExcludeDescendants">



    <include layout="@layout/confirm_lock_background_base" />

res/layout/confirm_lock_password_internal.xml

+2 −1
Original line number Diff line number Diff line
@@ -19,7 +19,8 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:icon="@drawable/ic_lock"

    android:layout="@layout/suw_glif_blank_template">

    android:layout="@layout/suw_glif_blank_template"

    android:importantForAutofill="noExcludeDescendants">



    <com.android.internal.widget.LinearLayoutWithDefaultTouchRecepient

        android:id="@+id/topLayout"