DO NOT MERGE Update NewUserDisclaimer UX
Bug: 177552737
Test: manual: set DO, create new user, switch user and check for
notification
atest com.android.car.settings.admin.NewUserDisclaimerActivityTest
Change-Id: Ifa49704d439135ab45f7b9316e08de76b76a0d3d
Merged-In: Ifa49704d439135ab45f7b9316e08de76b76a0d3d
(cherry picked from commit 6a4d35ceffde8ab114dc134e733eb7493f6b3694)
diff --git a/service/res/layout/new_user_disclaimer.xml b/service/res/layout/new_user_disclaimer.xml
index bdd0512..c5dc9ae 100644
--- a/service/res/layout/new_user_disclaimer.xml
+++ b/service/res/layout/new_user_disclaimer.xml
@@ -26,12 +26,15 @@
<com.android.car.admin.ui.ManagedDeviceTextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:gravity="center"/>
+ android:textSize="@dimen/activity_content_text_size"
+ android:gravity="center_horizontal"/>
<Button android:id="@+id/accept_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="48dp"
+ android:maxWidth="@dimen/action_button_max_width"
+ android:textSize="@dimen/action_button_text_size"
android:text="@string/new_user_managed_device_acceptance"
style="@style/ButtonStyle" />
diff --git a/service/res/values/dimens.xml b/service/res/values/dimens.xml
index 1cf1308..bb07196 100644
--- a/service/res/values/dimens.xml
+++ b/service/res/values/dimens.xml
@@ -23,11 +23,12 @@
<dimen name="common_margin">32dp</dimen>
- <!-- Dimensions for the Buttons in ActivityBlockingActivity -->
+ <!-- Dimensions for NewUserDisclaimerActivity -->
+ <dimen name="activity_content_text_size">@*android:dimen/car_body1_size</dimen>
<dimen name="action_button_height">76dp</dimen>
<dimen name="action_button_top_margin">48dp</dimen>
<dimen name="action_button_corner_radius">38dp</dimen>
- <dimen name="action_button_max_width">268dp</dimen>
+ <dimen name="action_button_max_width">500dp</dimen>
<dimen name="action_button_min_width">@*android:dimen/car_button_min_width</dimen>
<dimen name="action_button_text_size">@*android:dimen/car_body3_size</dimen>
<dimen name="action_button_padding_horizontal">@*android:dimen/car_padding_4</dimen>