Merge "[LockScreen] Don't extract UI in ChooseLockPassword"

This commit is contained in:
Maurice Lam
2015-01-23 17:44:05 +00:00
committed by Android (Google) Code Review

View File

@@ -16,9 +16,14 @@
** limitations under the License.
*/
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fillViewport="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal">
@@ -50,7 +55,7 @@
android:layout_gravity="center"
android:layout_weight="1"
android:inputType="textPassword"
android:imeOptions="actionNext"
android:imeOptions="actionNext|flagNoExtractUi"
android:gravity="center"
android:textSize="24sp"
style="@style/TextAppearance.PasswordEntry"
@@ -91,3 +96,5 @@
</RelativeLayout>
</LinearLayout>
</ScrollView>