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

Merge "Add zen onboarding screen" into pi-dev

Browse Source 
am: 34a593db65

Change-Id: Ifefd7007f798d7ff912f9e465d0b4788584570f1
This commit is contained in:
Julia Reynolds
2018-04-10 07:50:30 -07:00
committed by android-build-merger
parent 88fa6fd0fb 34a593db65
commit a87381e9a8
5 changed files with 523 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
res/layout/zen_onboarding.xml Normal file
View File

@@ -0,0 +1,167 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2018 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
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" />
<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:textAppearance="?android:attr/textAppearanceListItem"
android:text="@string/zen_onboarding_dnd_visual_disturbances_description" />
<LinearLayout
android:id="@+id/screen_off"
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">
<CheckBox
android:id="@+id/screen_off_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_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_off_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" />
<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"
android:onClick="save" />
</RelativeLayout>
</RelativeLayout>

10
res/values/strings.xml
View File

@@ -7325,6 +7325,16 @@
<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>
<string name="zen_onboarding_settings">Settings</string>
<string name="zen_onboarding_more_options">You can further customize this in Settings.</string>
<string name="zen_onboarding_screen_on_title">Block when the screen is on</string>
<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>
<string name="zen_onboarding_screen_off_summary">Don\'t turn on the screen or show notifications in the ambient display</string>
<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] -->
<string name="sound_work_settings">Work profile sounds</string>