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

This commit is contained in:
TreeHugger Robot
2017-08-23 00:24:13 +00:00
committed by Android (Google) Code Review

View File

@@ -56,6 +56,13 @@
</LinearLayout> </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 <com.android.internal.widget.LockPatternView
android:id="@+id/lockPattern" android:id="@+id/lockPattern"
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -84,6 +91,8 @@
android:contentDescription="@string/confirm_fingerprint_icon_content_description" android:contentDescription="@string/confirm_fingerprint_icon_content_description"
android:visibility="gone"/> android:visibility="gone"/>
</LinearLayout>
<Button <Button
android:id="@+id/cancelButton" android:id="@+id/cancelButton"
style="@style/SuwGlifButton.Secondary" style="@style/SuwGlifButton.Secondary"