Update zen onboarding ui

Test: robotests
Bug: 78448988
Change-Id: I1e70bf8d28f392b93bb102622340da0af65f4718
This commit is contained in:
Julia Reynolds
2018-04-30 09:13:34 -04:00
parent d940a680a5
commit 29ba3601b0
6 changed files with 58 additions and 261 deletions

View File

@@ -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>