PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jim Miller
2012-06-18 13:19:42 -07:00
committed by Android (Google) Code Review
parent 4d8dac0792 feeafe2e79
commit 284c9872ce
8 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/layout-land/choose_lock_password.xml
View File

@@ -50,6 +50,7 @@
android:singleLine="true" android:singleLine="true"
android:textStyle="bold" android:textStyle="bold"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext"
android:gravity="center" android:gravity="center"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="24sp" android:textSize="24sp"
@@ -58,7 +59,6 @@
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default" android:background="@drawable/password_field_default"
android:textColor="#ffffffff" android:textColor="#ffffffff"
android:imeOptions="actionNext|flagNoEnterAction"
/> />
</LinearLayout> </LinearLayout>

2
res/layout-land/confirm_lock_password.xml
View File

@@ -51,6 +51,7 @@
android:singleLine="true" android:singleLine="true"
android:textStyle="bold" android:textStyle="bold"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext"
android:gravity="center" android:gravity="center"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="24sp" android:textSize="24sp"
@@ -59,7 +60,6 @@
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default" android:background="@drawable/password_field_default"
android:textColor="#ffffffff" android:textColor="#ffffffff"
android:imeOptions="actionNext|flagNoEnterAction"
/> />
</LinearLayout> </LinearLayout>

1
res/layout-sw600dp-land/choose_lock_password.xml
View File

@@ -51,6 +51,7 @@
android:singleLine="true" android:singleLine="true"
android:textStyle="bold" android:textStyle="bold"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext"
android:gravity="center" android:gravity="center"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="24sp" android:textSize="24sp"

1
res/layout-sw600dp-land/confirm_lock_password.xml
View File

@@ -52,6 +52,7 @@
android:singleLine="true" android:singleLine="true"
android:textStyle="bold" android:textStyle="bold"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext"
android:gravity="center" android:gravity="center"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="24sp" android:textSize="24sp"

1
res/layout-sw600dp/choose_lock_password.xml
View File

@@ -46,6 +46,7 @@
android:singleLine="true" android:singleLine="true"
android:textStyle="bold" android:textStyle="bold"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext"
android:gravity="center" android:gravity="center"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="32sp" android:textSize="32sp"

1
res/layout-sw600dp/confirm_lock_password.xml
View File

@@ -49,6 +49,7 @@
android:singleLine="true" android:singleLine="true"
android:textStyle="bold" android:textStyle="bold"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext"
android:gravity="center" android:gravity="center"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="32sp" android:textSize="32sp"

2
res/layout/choose_lock_password.xml
View File

@@ -45,6 +45,7 @@
android:singleLine="true" android:singleLine="true"
android:textStyle="bold" android:textStyle="bold"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext"
android:gravity="center" android:gravity="center"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="24sp" android:textSize="24sp"
@@ -53,7 +54,6 @@
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default" android:background="@drawable/password_field_default"
android:textColor="#ffffffff" android:textColor="#ffffffff"
android:imeOptions="actionNext|flagNoEnterAction"
/> />
<!-- Spacer between password entry and keyboard --> <!-- Spacer between password entry and keyboard -->

2
res/layout/confirm_lock_password.xml
View File

@@ -49,6 +49,7 @@
android:singleLine="true" android:singleLine="true"
android:textStyle="bold" android:textStyle="bold"
android:inputType="textPassword" android:inputType="textPassword"
android:imeOptions="actionNext"
android:gravity="center" android:gravity="center"
android:layout_gravity="center" android:layout_gravity="center"
android:textSize="24sp" android:textSize="24sp"
@@ -57,7 +58,6 @@
android:textAppearance="?android:attr/textAppearanceLarge" android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default" android:background="@drawable/password_field_default"
android:textColor="#ffffffff" android:textColor="#ffffffff"
android:imeOptions="actionNext|flagNoEnterAction"
/> />
<!-- Spacer between password entry and keyboard --> <!-- Spacer between password entry and keyboard -->