From 6f6a7c6412768c191bf44dea96c54415087ac3eb Mon Sep 17 00:00:00 2001
From: Ajay Nadathur <ajayns@google.com>
Date: Wed, 10 Jan 2018 13:03:44 -0800
Subject: [PATCH] Fix NPE in SetupChooseLockpattern screen

bug: 71807569
Test: Manually tested and verified no longer crash
Change-Id: I9b6a20377f2cf7ffb9be12de7bfa59f8b1063625
---
 res/layout-land/choose_lock_pattern.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/res/layout-land/choose_lock_pattern.xml b/res/layout-land/choose_lock_pattern.xml
index b54a245feb9..cba6173a77f 100644
--- a/res/layout-land/choose_lock_pattern.xml
+++ b/res/layout-land/choose_lock_pattern.xml
@@ -84,10 +84,20 @@
                         android:id="@+id/headerText"
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                        android:layout_marginTop="16dp"
+                        android:layout_marginTop="10dp"
                         android:gravity="?attr/suwGlifHeaderGravity"
                         android:textSize="18sp"/>
 
+                    <Button
+                        android:id="@+id/screen_lock_options"
+                        style="@style/SuwGlifButton.Tertiary"
+                        android:layout_width="match_parent"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="5dp"
+                        android:gravity="?attr/suwGlifHeaderGravity"
+                        android:text="@string/setup_lock_settings_options_button_label"
+                        android:visibility="gone" />
+
                 </LinearLayout>
 
             </ScrollView>