diff options
author | Yorke Lee <yorkelee@google.com> | 2015-10-02 16:32:36 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-10-02 16:32:36 +0000 |
commit | 2159803d76ee72cb2561b56c17c377f19e5fdf37 (patch) | |
tree | 6b853b6348678ee8335c89988df3ee25f12ff99a /res | |
parent | 2ef15c5219c0b6edf35002d0b7a3c2cbc727f57b (diff) | |
parent | 545a779f0df2825067679bee09bc966ca12b5974 (diff) |
Merge "First pass for Dialer onboarding flow" into ub-contactsdialer-a-dev
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/onboarding_activity.xml | 21 | ||||
-rw-r--r-- | res/layout/onboarding_screen_fragment.xml | 66 | ||||
-rw-r--r-- | res/values/colors.xml | 5 | ||||
-rw-r--r-- | res/values/strings.xml | 18 | ||||
-rw-r--r-- | res/values/styles.xml | 7 |
5 files changed, 117 insertions, 0 deletions
diff --git a/res/layout/onboarding_activity.xml b/res/layout/onboarding_activity.xml new file mode 100644 index 000000000..a893ce4e7 --- /dev/null +++ b/res/layout/onboarding_activity.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/onboarding_fragment_container"> +</FrameLayout> diff --git a/res/layout/onboarding_screen_fragment.xml b/res/layout/onboarding_screen_fragment.xml new file mode 100644 index 000000000..f4136aed7 --- /dev/null +++ b/res/layout/onboarding_screen_fragment.xml @@ -0,0 +1,66 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2015 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" > + + <TextView + android:id="@+id/onboarding_screen_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/onboarding_screen_content" + android:textAppearance="?android:attr/textAppearanceLarge" + android:textColor="@color/onboarding_primary_text_color" /> + + <TextView + android:id="@id/onboarding_screen_content" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_above="@+id/onboarding_buttons_container" + android:layout_marginTop="20dp" + android:textColor="@color/onboarding_primary_text_color" /> + + <LinearLayout + android:id="@id/onboarding_buttons_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_marginTop="20dp" > + + <Button + android:id="@+id/onboard_skip_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center" + android:text="@string/onboarding_skip_button" + android:textColor="@color/onboarding_primary_text_color" + style="?android:attr/borderlessButtonStyle" /> + + <Button + android:id="@+id/onboard_next_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:gravity="center" + android:text="@string/onboarding_next_button" + android:textColor="@color/onboarding_primary_text_color" + style="?android:attr/borderlessButtonStyle" /> + + </LinearLayout> +</RelativeLayout> diff --git a/res/values/colors.xml b/res/values/colors.xml index a747927d1..ad493e147 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -111,4 +111,9 @@ <color name="delete_icon_tint">#6D6D6D</color> <color name="blocked_number_background">#E0E0E0</color> <color name="blocked_number_accent_color">#42A5F5</color> + + <!-- Colors for onboarding flow --> + <color name="onboarding_primary_text_color">#ffffff</color> + <color name="onboarding_default_dialer_screen_background_color">#e06055</color> + <color name="onboarding_permissions_screen_background_color">#689f38</color> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index d92471e95..e5d32ea6c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -884,4 +884,22 @@ <!-- Shown as a message that notifies the user that the Phone app cannot write to system settings, which is why the system settings app is being launched directly instead.--> <string name="toast_cannot_write_system_settings">Phone app does not have permission to write to system settings.</string> + + <!-- Title of the onboarding screen that asks the user to make Phone the default Phone app --> + <string name="request_default_dialer_screen_title">A better way of calling is calling</string> + + <!-- Content of the onboarding screen that asks the user to make Phone the default Phone app --> + <string name="request_default_dialer_screen_content">Make Phone your default phone app to be able to do things like see who\'s calling you, even when they\'re not in your contacts.</string> + + <!-- Title of the onboarding screen that asks the user to grant us the Contacts and Phone permissions --> + <string name="request_permissions_screen_title">Get talking to your friends and family</string> + + <!-- Content of the onboarding screen that asks the user to grant us the Contacts and Phone permissions --> + <string name="request_permissions_screen_content">Phone will need to access your phone and contacts to make calls to people in your contacts.</string> + + <!-- The label of the button used to skip a screen in the onboarding flow --> + <string name="onboarding_skip_button">Skip</string> + + <!-- The label of the button used to go to the next screen in the onboarding flow --> + <string name="onboarding_next_button">Next</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 17b4a2561..86c3ad47d 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -109,6 +109,13 @@ <item name="actionOverflowButtonStyle">@style/DialtactsActionBarOverflowWhite</item> </style> + <style name="OnboardingFlowTheme" parent="DialtactsThemeWithoutActionBarOverlay"> + <item name="android:windowActionBar">false</item> + <item name="windowActionBar">false</item> + <item name="android:windowNoTitle">true</item> + <item name="windowNoTitle">true</item> + </style> + <!-- Hide the actionbar title during the activity preview --> <style name="DialtactsActivityTheme" parent="DialtactsTheme"> <!-- Styles that require AppCompat compatibility, remember to update both sets --> |