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

Fix 4283049: Restore continue/cancel buttons in LockScreen Settings

Browse Source 
This fixes a bug where the continue/cancel buttons were missing
from LockScreen settings in landscape mode.

The change also includes a minor change to enable using the IME enter
key to proceed to the next step.

Change-Id: I2dca0b40e38a128cc0aa637f573da01e779edb73
This commit is contained in:
Jim Miller
2011-04-15 18:52:31 -07:00
parent 2c701570eb
commit 74b1e0a733
6 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,15 +58,10 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default"
android:textColor="#ffffffff"
android:imeOptions="actionNext|flagNoEnterAction"
/>
</LinearLayout>
<!-- Spacer between password entry and keyboard -->
<View
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1" />
<!-- Alphanumeric keyboard -->
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_alignParentBottom="true"
@@ -78,29 +73,26 @@
/>
<RelativeLayout
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:background="@android:drawable/bottom_bar"
android:visibility="gone">
<Button android:id="@+id/cancel_button"
android:layout_width="150dip"
android:layout_height="wrap_content"
android:layout_margin="5dip"
android:layout_alignParentLeft="true"
android:text="@string/lockpassword_cancel_label"
/>
<Button android:id="@+id/next_button"
android:layout_width="150dip"
android:layout_height="wrap_content"
android:layout_margin="5dip"
android:layout_height="0dip"
android:layout_weight="1">
<LinearLayout
style="@style/SecurityPreferenceButtonContainer"
android:orientation="horizontal"
android:layout_alignParentRight="true"
android:drawableRight="@drawable/ic_btn_next"
android:drawablePadding="10dip"
android:text="@string/lockpassword_continue_label"
/>
android:layout_alignParentBottom="true">
<!-- left : cancel -->
<Button android:id="@+id/cancel_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_cancel_label"/>
<!-- right : continue -->
<Button android:id="@+id/next_button"
style="@style/SecurityPreferenceButton"
android:text="@string/lockpassword_continue_label"/>
</LinearLayout>
</RelativeLayout>
</LinearLayout>

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

@@ -59,6 +59,7 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default"
android:textColor="#ffffffff"
android:imeOptions="actionNext|flagNoEnterAction"
/>
</LinearLayout>

1
res/layout/choose_lock_password.xml
View File

@@ -54,6 +54,7 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default"
android:textColor="#ffffffff"
android:imeOptions="actionNext|flagNoEnterAction"
/>
<!-- Spacer between password entry and keyboard -->

1
res/layout/confirm_lock_password.xml
View File

@@ -57,6 +57,7 @@
android:textAppearance="?android:attr/textAppearanceLarge"
android:background="@drawable/password_field_default"
android:textColor="#ffffffff"
android:imeOptions="actionNext|flagNoEnterAction"
/>
<!-- Spacer between password entry and keyboard -->

6
src/com/android/settings/ChooseLockPassword.java
View File

@@ -405,8 +405,10 @@ public class ChooseLockPassword extends PreferenceActivity {
}
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
// Check if this was the result of hitting the enter key
if (actionId == EditorInfo.IME_NULL && event.getAction() == KeyEvent.ACTION_DOWN) {
// Check if this was the result of hitting the enter or "done" key
if (actionId == EditorInfo.IME_NULL
|| actionId == EditorInfo.IME_ACTION_DONE
|| actionId == EditorInfo.IME_ACTION_NEXT) {
handleNext();
return true;
}

6
src/com/android/settings/ConfirmLockPassword.java
View File

@@ -173,8 +173,10 @@ public class ConfirmLockPassword extends PreferenceActivity {
}
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
// Check if this was the result of hitting the enter key
if (actionId == EditorInfo.IME_NULL) {
// Check if this was the result of hitting the enter or "done" key
if (actionId == EditorInfo.IME_NULL
|| actionId == EditorInfo.IME_ACTION_DONE
|| actionId == EditorInfo.IME_ACTION_NEXT) {
handleNext();
return true;
}