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

Commit 284c9872 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Fix 6663465: remove flagNoEnterAction in favor of actionNext" into jb-dev

parents 4d8dac07 feeafe2e

res/layout-land/choose_lock_password.xml

+1 −1
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ 
            android:singleLine="true"

            android:textStyle="bold"

            android:inputType="textPassword"

            android:imeOptions="actionNext"

            android:gravity="center"

            android:layout_gravity="center"

            android:textSize="24sp"
@@ -58,7 +59,6 @@ 
            android:textAppearance="?android:attr/textAppearanceLarge"

            android:background="@drawable/password_field_default"

            android:textColor="#ffffffff"

            android:imeOptions="actionNext|flagNoEnterAction"

        />

    </LinearLayout>

res/layout-land/confirm_lock_password.xml

+1 −1
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
            android:singleLine="true"

            android:textStyle="bold"

            android:inputType="textPassword"

            android:imeOptions="actionNext"

            android:gravity="center"

            android:layout_gravity="center"

            android:textSize="24sp"
@@ -59,7 +60,6 @@ 
            android:textAppearance="?android:attr/textAppearanceLarge"

            android:background="@drawable/password_field_default"

            android:textColor="#ffffffff"

            android:imeOptions="actionNext|flagNoEnterAction"

        />

    </LinearLayout>

res/layout-sw600dp-land/choose_lock_password.xml

+1 −0
Original line number Diff line number Diff line
@@ -51,6 +51,7 @@ 
            android:singleLine="true"

            android:textStyle="bold"

            android:inputType="textPassword"

            android:imeOptions="actionNext"

            android:gravity="center"

            android:layout_gravity="center"

            android:textSize="24sp"

res/layout-sw600dp-land/confirm_lock_password.xml

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ 
            android:singleLine="true"

            android:textStyle="bold"

            android:inputType="textPassword"

            android:imeOptions="actionNext"

            android:gravity="center"

            android:layout_gravity="center"

            android:textSize="24sp"

res/layout-sw600dp/choose_lock_password.xml

+1 −0
Original line number Diff line number Diff line
@@ -46,6 +46,7 @@ 
        android:singleLine="true"

        android:textStyle="bold"

        android:inputType="textPassword"

        android:imeOptions="actionNext"

        android:gravity="center"

        android:layout_gravity="center"

        android:textSize="32sp"