Update zen onboarding ui
Test: robotests Bug: 78448988 Change-Id: I1e70bf8d28f392b93bb102622340da0af65f4718
This commit is contained in:
Julia Reynolds
@@ -16,152 +16,49 @@
|
||||
-->
|
||||
<RelativeLayout
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:layout_width="320dp"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="20dp">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/header_icon"
|
||||
android:layout_width="32dp"
|
||||
android:layout_height="32dp"
|
||||
android:layout_alignParentTop="true"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:src="@drawable/ic_zen"
|
||||
android:tint="?android:attr/colorAccent"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/header"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/header_icon"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="12dp"
|
||||
android:text="@string/zen_onboarding_dnd_visual_disturbances_header"
|
||||
android:textAppearance="@android:style/TextAppearance.Material.Headline" />
|
||||
android:textAppearance="@android:style/TextAppearance.Material.DialogWindowTitle" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/feature_description"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/header"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:textAlignment="center"
|
||||
android:layout_marginTop="14dp"
|
||||
android:layout_marginTop="24dp"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
||||
android:text="@string/zen_onboarding_dnd_visual_disturbances_description" />
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/screen_off"
|
||||
<RelativeLayout
|
||||
android:id="@+id/buttons"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/feature_description"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="35dp"
|
||||
android:orientation="horizontal">
|
||||
android:layout_marginTop="35dp">
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/screen_off_option"
|
||||
<Button
|
||||
android:id="@+id/no"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingHorizontal="8dp"
|
||||
android:onClick="logClick" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/screen_off_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/zen_onboarding_screen_off_title"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/screen_off_summary"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/zen_onboarding_screen_off_summary" />
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/screen_on"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/screen_off"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="10dp"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<CheckBox
|
||||
android:id="@+id/screen_on_option"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingHorizontal="8dp"
|
||||
android:onClick="logClick" />
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/screen_on_title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/zen_onboarding_screen_on_title"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem" />
|
||||
|
||||
<TextView
|
||||
android:id="@+id/screen_on_summary"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@string/zen_onboarding_screen_on_summary" />
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/further_customize"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/screen_on"
|
||||
android:layout_centerHorizontal="true"
|
||||
android:layout_marginTop="20dp"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
||||
android:text="@string/zen_onboarding_more_options" />
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_below="@+id/further_customize"
|
||||
android:layout_marginTop="35dp"
|
||||
android:id="@+id/buttons">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/settings"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentStart="true"
|
||||
android:layout_weight="1"
|
||||
android:layout_centerInParent="true"
|
||||
android:text="@string/zen_onboarding_settings"
|
||||
android:textAppearance="?android:attr/textAppearanceListItem"
|
||||
android:textColor="?android:attr/colorControlActivated"
|
||||
android:onClick="launchSettings" />
|
||||
android:text="@string/zen_onboarding_no_update"
|
||||
android:layout_toStartOf="@+id/ok"
|
||||
style="@style/TextAppearance.ZenOnboardingButton"
|
||||
android:onClick="close" />
|
||||
|
||||
<Button
|
||||
android:id="@+id/ok"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_alignParentEnd="true"
|
||||
android:layout_weight="1"
|
||||
android:layout_centerInParent="true"
|
||||
android:text="@string/zen_onboarding_ok"
|
||||
style="@style/ActionPrimaryButton"
|
||||
style="@style/TextAppearance.ZenOnboardingButton"
|
||||
android:onClick="save" />
|
||||
</RelativeLayout>
|
||||
</RelativeLayout>
|
||||
@@ -7360,14 +7360,26 @@
|
||||
<item quantity="other"><xliff:g id="on_count" example="3">%d</xliff:g> rules can turn on automatically</item>
|
||||
</plurals>
|
||||
|
||||
<string name="zen_onboarding_ok">Ok</string>
|
||||
<!-- Do not disturb onboarding dialog, accept new settings [CHAR LIMIT=30]-->
|
||||
<string name="zen_onboarding_ok">Update</string>
|
||||
<!-- Do not disturb onboarding dialog, do not accept new settings [CHAR LIMIT=30]-->
|
||||
<string name="zen_onboarding_no_update">Don\'t update</string>
|
||||
<!-- Do not disturb onboarding dialog, description of new settings [CHAR LIMIT=NONE]-->
|
||||
<string name="zen_onboarding_dnd_visual_disturbances_description">Your phone mutes sounds & vibrations\n\nUpdate settings to also:\n\n- Hide notifications\n\n- Only show calls from starred contacts</string>
|
||||
<!-- Do not disturb onboarding dialog, header prompt for settings [CHAR LIMIT=80]-->
|
||||
<string name="zen_onboarding_dnd_visual_disturbances_header">Update your Do Not Disturb settings?</string>
|
||||
|
||||
<!-- obsolete -->
|
||||
<string name="zen_onboarding_settings">Settings</string>
|
||||
<!-- obsolete -->
|
||||
<string name="zen_onboarding_more_options">You can further customize this in Settings.</string>
|
||||
<!-- obsolete -->
|
||||
<string name="zen_onboarding_screen_on_title">Block when the screen is on</string>
|
||||
<!-- obsolete -->
|
||||
<string name="zen_onboarding_screen_off_title">Block when the screen is off</string>
|
||||
<string name="zen_onboarding_dnd_visual_disturbances_description">Do Not Disturb can do more than block unwanted sounds - it can block visuals too. This may be helpful if you\'re trying to sleep, focus, or limit time spent on your phone.</string>
|
||||
<string name="zen_onboarding_dnd_visual_disturbances_header">Block sounds and visuals</string>
|
||||
<!-- obsolete -->
|
||||
<string name="zen_onboarding_screen_off_summary">Don\'t turn on the screen or wake for notifications</string>
|
||||
<!-- obsolete -->
|
||||
<string name="zen_onboarding_screen_on_summary">Don\'t show notifications at all, except for basic phone activity and status</string>
|
||||
|
||||
<!-- Work Sounds: Work sound settings section header. [CHAR LIMIT=50] -->
|
||||
|
||||
@@ -432,6 +432,17 @@
|
||||
<item name="android:ellipsize">marquee</item>
|
||||
</style>
|
||||
|
||||
<style name="TextAppearance.ZenOnboardingButton">
|
||||
<item name="android:fontFamily">sans-serif-medium</item>
|
||||
<item name="android:textSize">14sp</item>
|
||||
<item name="android:textColor">?android:attr/colorAccent</item>
|
||||
<item name="android:background">@drawable/btn_borderless_rect</item>
|
||||
<item name="android:gravity">center</item>
|
||||
<item name="android:focusable">true</item>
|
||||
<item name="android:paddingStart">8dp</item>
|
||||
<item name="android:paddingEnd">8dp</item>
|
||||
</style>
|
||||
|
||||
<style name="ActionPrimaryButton" parent="android:Widget.DeviceDefault.Button.Colored"/>
|
||||
|
||||
<style name="ActionSecondaryButton" parent="android:Widget.DeviceDefault.Button"/>
|
||||
|
||||
Reference in New Issue
Block a user