PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DO NOT MERGE Update zen onboarding

Browse Source 
- Update text
- Update buttons
- Update style

Bug: 79702414
Bug: 78447976
Bug: 79525632
Test: ZenOnboardingActivityTest
Change-Id: Ied476fc920828409993953fba32bf3dae324ea3c
This commit is contained in:
Beverly
2018-05-14 16:45:49 -04:00
parent a924a1e2ae
commit e3a66fc16d
5 changed files with 184 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

114
res/layout/zen_onboarding.xml
View File

@@ -17,40 +17,112 @@
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="320dp"
android:layout_height="wrap_content"
android:padding="20dp">
android:layout_height="wrap_content" >
<TextView
android:id="@+id/header"
android:layout_width="wrap_content"
<RelativeLayout
android:id="@+id/zen_onboarding_choices"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/zen_onboarding_dnd_visual_disturbances_header"
android:textAppearance="@android:style/TextAppearance.Material.DialogWindowTitle" />
android:paddingLeft="24dp"
android:paddingRight="24dp"
android:paddingTop="18dp">
<TextView
android:id="@+id/feature_description"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/header"
android:layout_marginTop="24dp"
android:textAppearance="?android:attr/textAppearanceListItem"
android:text="@string/zen_onboarding_dnd_visual_disturbances_description" />
<TextView
android:id="@+id/header"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/zen_onboarding_dnd_visual_disturbances_header"
android:textAppearance="@android:style/TextAppearance.Material.DialogWindowTitle" />
<LinearLayout
android:id="@+id/zen_onboarding_new_setting"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/header"
android:layout_centerHorizontal="true"
android:layout_marginTop="22dp"
android:orientation="horizontal">
<RadioButton
android:id="@+id/zen_onboarding_new_setting_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="8dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/zen_onboarding_new_setting_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/zen_onboarding_new_setting_title"
android:textAppearance="?android:attr/textAppearanceListItem" />
<TextView
android:id="@+id/zen_onboarding_new_setting_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/zen_onboarding_new_setting_summary" />
</LinearLayout>
</LinearLayout>
<LinearLayout
android:id="@+id/zen_onboarding_current_setting"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/zen_onboarding_new_setting"
android:layout_centerHorizontal="true"
android:layout_marginTop="10dp"
android:orientation="horizontal">
<RadioButton
android:id="@+id/zen_onboarding_current_setting_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingHorizontal="8dp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:id="@+id/zen_onboarding_current_setting_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/zen_onboarding_current_setting_title"
android:textAppearance="?android:attr/textAppearanceListItem" />
<TextView
android:id="@+id/zen_onboarding_current_setting_summary"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="@string/zen_onboarding_current_setting_summary" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/buttons"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/feature_description"
android:layout_marginTop="35dp">
android:layout_below="@+id/zen_onboarding_choices"
android:layout_marginLeft="8dp"
android:layout_marginTop="20dp"
android:layout_marginBottom="10dp">
<Button
android:id="@+id/no"
android:id="@+id/settings"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/zen_onboarding_no_update"
android:layout_toStartOf="@+id/ok"
android:text="@string/zen_onboarding_settings"
android:layout_alignParentStart="true"
style="@style/TextAppearance.ZenOnboardingButton"
android:onClick="close" />
android:onClick="launchSettings" />
<Button
android:id="@+id/ok"