diff options
| author | Ben Komalo <benkomalo@google.com> | 2011-08-26 14:40:18 -0700 |
|---|---|---|
| committer | Ben Komalo <benkomalo@google.com> | 2011-08-29 15:14:18 -0700 |
| commit | 9fcb6a7fac02aef85085c2db616556257e1642f5 (patch) | |
| tree | ee78bff3ac828a4954ab65c8bdb82e78650b4f2a /res/layout-sw600dp-land | |
| parent | 427a7ba1048d81b6b4fdcf29072c7584f6c18b87 (diff) | |
| download | packages_apps_Settings-9fcb6a7fac02aef85085c2db616556257e1642f5.tar.gz packages_apps_Settings-9fcb6a7fac02aef85085c2db616556257e1642f5.tar.bz2 packages_apps_Settings-9fcb6a7fac02aef85085c2db616556257e1642f5.zip | |
Misc fixes to CryptKeeper
- use standard IME, but force it into ASCII if it's the default IME
- provide an IME switcher if there are multiple IME's, in case the
ASCII-capable one is a different one
- make the IME shown by default
Bug: 5004456
Bug: 4698473
Change-Id: Id40a164cfe599bfdb67b81f60d4ab8a52208de88
Diffstat (limited to 'res/layout-sw600dp-land')
| -rw-r--r-- | res/layout-sw600dp-land/crypt_keeper_password_entry.xml | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml index 9415fd1e4..8898b7610 100644 --- a/res/layout-sw600dp-land/crypt_keeper_password_entry.xml +++ b/res/layout-sw600dp-land/crypt_keeper_password_entry.xml @@ -46,18 +46,15 @@ /> <!-- Password entry field --> - <view - class="com.android.settings.CryptKeeper$CryptEditText" - android:id="@+id/passwordEntry" + <LinearLayout android:layout_height="wrap_content" android:layout_width="320dip" android:layout_toRightOf="@+id/passwordLabel" android:layout_centerVertical="true" - android:singleLine="true" - android:inputType="textPassword" - android:textAppearance="?android:attr/textAppearanceMedium" - android:editable="false" - /> + android:orientation="horizontal" + > + <include layout="@layout/crypt_keeper_password_field" /> + </LinearLayout> <TextView android:id="@+id/status" android:layout_height="wrap_content" |