Merge "Misc fixes to CryptKeeper"

This commit is contained in:
Ben Komalo
2011-08-31 15:05:07 -07:00
committed by Android (Google) Code Review
11 changed files with 211 additions and 100 deletions

View File

@@ -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>
</RelativeLayout>