Add the toolbar to the confirm security screens
Bug: 151223892
Test: manual
Change-Id: I71061f17be2c5d32611d5a35f64239b5767d3431
diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml
index 437fa4d..4b92d9c 100644
--- a/res/layout/confirm_lock_password.xml
+++ b/res/layout/confirm_lock_password.xml
@@ -20,31 +20,42 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center"
android:orientation="vertical">
- <EditText
- android:id="@+id/password_entry"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@*android:dimen/action_bar_margin"
- android:gravity="center"
- android:inputType="textPassword"
- android:maxLines="1"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
+ <include layout="@layout/toolbar"/>
- <TextView
+ <LinearLayout
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginHorizontal="@dimen/car_ui_margin"
android:gravity="center"
- android:text="@string/lock_settings_enter_password"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
+ android:orientation="vertical">
- <TextView
- android:id="@+id/message"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:freezesText="true"
- android:gravity="center"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
+ <EditText
+ android:id="@+id/password_entry"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@*android:dimen/action_bar_margin"
+ android:gravity="center"
+ android:inputType="textPassword"
+ android:maxLines="1"
+ android:textAppearance="?android:attr/textAppearanceLarge">
+ <requestFocus/>
+ </EditText>
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:text="@string/lock_settings_enter_password"
+ android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+ <TextView
+ android:id="@+id/message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:freezesText="true"
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
+ </LinearLayout>
</LinearLayout>
diff --git a/res/layout/confirm_lock_pattern.xml b/res/layout/confirm_lock_pattern.xml
index eac1720..dc35577 100644
--- a/res/layout/confirm_lock_pattern.xml
+++ b/res/layout/confirm_lock_pattern.xml
@@ -20,27 +20,35 @@
android:id="@+id/container"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:gravity="center"
android:orientation="vertical">
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/confirm_lock_message_vertical_spacing"
- android:text="@string/lock_settings_enter_pattern"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
+ <include layout="@layout/toolbar"/>
- <TextView
- android:id="@+id/message"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/confirm_lock_message_vertical_spacing"
+ <LinearLayout
android:gravity="center"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginHorizontal="@dimen/car_ui_margin"
+ android:orientation="vertical">
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/confirm_lock_message_vertical_spacing"
+ android:text="@string/lock_settings_enter_pattern"
+ android:textAppearance="?android:attr/textAppearanceLarge"/>
- <com.android.internal.widget.LockPatternView
- android:id="@+id/lockPattern"
- style="@style/LockPattern"
- android:layout_width="@dimen/confirm_pattern_dimension"
- android:layout_height="@dimen/confirm_pattern_dimension"/>
+ <TextView
+ android:id="@+id/message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/confirm_lock_message_vertical_spacing"
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
+
+ <com.android.internal.widget.LockPatternView
+ android:id="@+id/lockPattern"
+ style="@style/LockPattern"
+ android:layout_width="@dimen/confirm_pattern_dimension"
+ android:layout_height="@dimen/confirm_pattern_dimension"/>
+ </LinearLayout>
</LinearLayout>
diff --git a/res/layout/confirm_lock_pin.xml b/res/layout/confirm_lock_pin.xml
index bb7cec4..2414545 100644
--- a/res/layout/confirm_lock_pin.xml
+++ b/res/layout/confirm_lock_pin.xml
@@ -19,57 +19,65 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:layout_marginHorizontal="@*android:dimen/action_bar_margin"
- android:orientation="horizontal">
+ android:orientation="vertical">
- <!-- Start side: lock PIN -->
- <FrameLayout
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="@integer/content_weight"
- android:gravity="center">
+ <include layout="@layout/toolbar"/>
- <com.android.car.settings.security.PinPadView
- android:id="@+id/pin_pad"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:columnCount="3"/>
- </FrameLayout>
-
- <!-- End side: pin entry field and messages -->
<LinearLayout
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_weight="@integer/illustration_weight"
- android:orientation="vertical">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_marginHorizontal="@dimen/car_ui_margin"
+ android:orientation="horizontal">
- <EditText
- android:id="@+id/password_entry"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginHorizontal="@dimen/pin_password_entry_padding_horizontal"
- android:cursorVisible="false"
- android:focusable="false"
- android:gravity="center"
- android:inputType="textPassword"
- android:maxLines="1"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
+ <!-- Start side: lock PIN -->
+ <FrameLayout
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="@integer/content_weight"
+ android:gravity="center">
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/confirm_lock_message_vertical_spacing"
- android:gravity="center"
- android:text="@string/lock_settings_enter_pin"
- android:textAppearance="?android:attr/textAppearanceLarge"/>
+ <com.android.car.settings.security.PinPadView
+ android:id="@+id/pin_pad"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:columnCount="3"/>
+ </FrameLayout>
- <TextView
- android:id="@+id/message"
- android:layout_width="match_parent"
+ <!-- End side: pin entry field and messages -->
+ <LinearLayout
+ android:layout_width="0dp"
android:layout_height="wrap_content"
- android:gravity="center"
- android:textAppearance="?android:attr/textAppearanceMedium"/>
+ android:layout_gravity="center_vertical"
+ android:layout_weight="@integer/illustration_weight"
+ android:orientation="vertical">
+
+ <EditText
+ android:id="@+id/password_entry"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginHorizontal="@dimen/pin_password_entry_padding_horizontal"
+ android:cursorVisible="false"
+ android:focusable="false"
+ android:gravity="center"
+ android:inputType="textPassword"
+ android:maxLines="1"
+ android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+ <TextView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/confirm_lock_message_vertical_spacing"
+ android:gravity="center"
+ android:text="@string/lock_settings_enter_pin"
+ android:textAppearance="?android:attr/textAppearanceLarge"/>
+
+ <TextView
+ android:id="@+id/message"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center"
+ android:textAppearance="?android:attr/textAppearanceMedium"/>
+ </LinearLayout>
</LinearLayout>
</LinearLayout>
