Merge "Pattern entry views should be consistent" into oc-mr1-dev

2017-08-23 00:24:13 +00:00
parent e040ef4a39 e4cfb6a594
commit a6b67d15eb
1 changed files with 33 additions and 24 deletions
--- a/res/layout/confirm_lock_pattern_internal_base.xml
+++ b/res/layout/confirm_lock_pattern_internal_base.xml
@@ -56,6 +56,13 @@

        </LinearLayout>

+        <LinearLayout
+            style="@style/SuwContentFrame"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical"
+            android:gravity="center">
+
            <com.android.internal.widget.LockPatternView
                android:id="@+id/lockPattern"
                android:layout_width="match_parent"
@@ -84,6 +91,8 @@
                android:contentDescription="@string/confirm_fingerprint_icon_content_description"
                android:visibility="gone"/>

+        </LinearLayout>
+
        <Button
            android:id="@+id/cancelButton"
            style="@style/SuwGlifButton.Secondary"