Merge "Move ImeAwareTextEdit to android.widget" into rvc-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
4c221d1609
@@ -22,7 +22,7 @@
|
||||
<merge xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<!-- Note that crypt_keeper_pin_field.xml also has ImeAwareEditText with the same ID. -->
|
||||
<com.android.settings.widget.ImeAwareEditText android:id="@+id/passwordEntry"
|
||||
<ImeAwareEditText android:id="@+id/passwordEntry"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="0dip"
|
||||
android:layout_weight="1"
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
<merge xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<!-- Note that crypt_keeper_password_field.xml also has ImeAwareEditText with the same ID. -->
|
||||
<com.android.settings.widget.ImeAwareEditText android:id="@+id/passwordEntry"
|
||||
<ImeAwareEditText android:id="@+id/passwordEntry"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_width="0dip"
|
||||
android:layout_weight="1"
|
||||
|
||||
@@ -35,7 +35,7 @@
|
||||
android:clipChildren="false"
|
||||
android:clipToPadding="false" />
|
||||
|
||||
<com.android.settings.widget.ImeAwareEditText
|
||||
<ImeAwareEditText
|
||||
android:id="@+id/fingerprint_rename_field"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
|
||||
Reference in New Issue
Block a user