diff options
| author | Ben Komalo <benkomalo@google.com> | 2011-08-31 15:05:07 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-08-31 15:05:07 -0700 |
| commit | be4fa0bf95006c8c8e4471c9122c771def38f13b (patch) | |
| tree | 9b90e9720dec11c6d9bfe45ec8c465439db084d1 /res/layout-sw600dp | |
| parent | f38534f4b5d9f37753ccdffea3337b6f11cb8375 (diff) | |
| parent | 9fcb6a7fac02aef85085c2db616556257e1642f5 (diff) | |
| download | packages_apps_Settings-be4fa0bf95006c8c8e4471c9122c771def38f13b.zip packages_apps_Settings-be4fa0bf95006c8c8e4471c9122c771def38f13b.tar.gz packages_apps_Settings-be4fa0bf95006c8c8e4471c9122c771def38f13b.tar.bz2 | |
Merge "Misc fixes to CryptKeeper"
Diffstat (limited to 'res/layout-sw600dp')
| -rw-r--r-- | res/layout-sw600dp/crypt_keeper_password_entry.xml | 24 |
1 files changed, 6 insertions, 18 deletions
diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml index 0610ec0..bc2b353 100644 --- a/res/layout-sw600dp/crypt_keeper_password_entry.xml +++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml @@ -45,18 +45,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_marginTop="26dip" - 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" @@ -72,13 +69,4 @@ /> </RelativeLayout> - <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:background="#00000000" - android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans" - android:visibility="visible" - /> - -</RelativeLayout>
\ No newline at end of file +</RelativeLayout> |