OSDN Git Service

Fix NPE in SetupChooseLockpattern screen
authorAjay Nadathur <ajayns@google.com>
Wed, 10 Jan 2018 21:03:44 +0000 (13:03 -0800)
committerAjay Nadathur <ajayns@google.com>
Wed, 10 Jan 2018 22:01:21 +0000 (14:01 -0800)
bug: 71807569
Test: Manually tested and verified no longer crash
Change-Id: I9b6a20377f2cf7ffb9be12de7bfa59f8b1063625

res/layout-land/choose_lock_pattern.xml

index b54a245..cba6173 100644 (file)
                         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>