diff options
author | Yorke Lee <yorkelee@google.com> | 2015-10-27 17:43:38 +0000 |
---|---|---|
committer | Yorke Lee <yorkelee@google.com> | 2015-10-27 22:04:21 +0000 |
commit | 9ce5286ab3644733339ff739bf15f8ce36e41524 (patch) | |
tree | 17ef53f0aa4188fff3215cc124314293813311e1 /res | |
parent | 996cb6f52901ab9e67354978f7f04e677600ee9f (diff) |
Remove onboarding flow
Straight revert of all onboarding flow related CLs -
the onboarding flow is not needed for now as the Dialer
will always at least be the system dialer.
Bug: 25020847
Change-Id: Ic1c5020b9b423de50801485f764209b21d5d7f33
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable-hdpi/ill_onboard_default.png | bin | 14583 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ill_onboard_permissions.png | bin | 41910 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ill_onboard_default.png | bin | 8434 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ill_onboard_permissions.png | bin | 21933 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ill_onboard_default.png | bin | 22090 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ill_onboard_permissions.png | bin | 62932 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ill_onboard_default.png | bin | 40178 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ill_onboard_permissions.png | bin | 125532 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxxhdpi/ill_onboard_default.png | bin | 62596 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxxhdpi/ill_onboard_permissions.png | bin | 198221 -> 0 bytes | |||
-rw-r--r-- | res/layout/onboarding_activity.xml | 21 | ||||
-rw-r--r-- | res/layout/onboarding_screen_fragment.xml | 71 | ||||
-rw-r--r-- | res/values/colors.xml | 6 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 | ||||
-rw-r--r-- | res/values/strings.xml | 18 | ||||
-rw-r--r-- | res/values/styles.xml | 9 |
16 files changed, 0 insertions, 127 deletions
diff --git a/res/drawable-hdpi/ill_onboard_default.png b/res/drawable-hdpi/ill_onboard_default.png Binary files differdeleted file mode 100644 index d16c1f429..000000000 --- a/res/drawable-hdpi/ill_onboard_default.png +++ /dev/null diff --git a/res/drawable-hdpi/ill_onboard_permissions.png b/res/drawable-hdpi/ill_onboard_permissions.png Binary files differdeleted file mode 100644 index 90ef14c80..000000000 --- a/res/drawable-hdpi/ill_onboard_permissions.png +++ /dev/null diff --git a/res/drawable-mdpi/ill_onboard_default.png b/res/drawable-mdpi/ill_onboard_default.png Binary files differdeleted file mode 100644 index 41de46742..000000000 --- a/res/drawable-mdpi/ill_onboard_default.png +++ /dev/null diff --git a/res/drawable-mdpi/ill_onboard_permissions.png b/res/drawable-mdpi/ill_onboard_permissions.png Binary files differdeleted file mode 100644 index 3ec39db9d..000000000 --- a/res/drawable-mdpi/ill_onboard_permissions.png +++ /dev/null diff --git a/res/drawable-xhdpi/ill_onboard_default.png b/res/drawable-xhdpi/ill_onboard_default.png Binary files differdeleted file mode 100644 index 1cf47df28..000000000 --- a/res/drawable-xhdpi/ill_onboard_default.png +++ /dev/null diff --git a/res/drawable-xhdpi/ill_onboard_permissions.png b/res/drawable-xhdpi/ill_onboard_permissions.png Binary files differdeleted file mode 100644 index ab52a5823..000000000 --- a/res/drawable-xhdpi/ill_onboard_permissions.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ill_onboard_default.png b/res/drawable-xxhdpi/ill_onboard_default.png Binary files differdeleted file mode 100644 index f243d44c0..000000000 --- a/res/drawable-xxhdpi/ill_onboard_default.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ill_onboard_permissions.png b/res/drawable-xxhdpi/ill_onboard_permissions.png Binary files differdeleted file mode 100644 index 4725bfd29..000000000 --- a/res/drawable-xxhdpi/ill_onboard_permissions.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ill_onboard_default.png b/res/drawable-xxxhdpi/ill_onboard_default.png Binary files differdeleted file mode 100644 index 53f858d0b..000000000 --- a/res/drawable-xxxhdpi/ill_onboard_default.png +++ /dev/null diff --git a/res/drawable-xxxhdpi/ill_onboard_permissions.png b/res/drawable-xxxhdpi/ill_onboard_permissions.png Binary files differdeleted file mode 100644 index f406a9531..000000000 --- a/res/drawable-xxxhdpi/ill_onboard_permissions.png +++ /dev/null diff --git a/res/layout/onboarding_activity.xml b/res/layout/onboarding_activity.xml deleted file mode 100644 index a893ce4e7..000000000 --- a/res/layout/onboarding_activity.xml +++ /dev/null @@ -1,21 +0,0 @@ -<?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 deleted file mode 100644 index f60225d90..000000000 --- a/res/layout/onboarding_screen_fragment.xml +++ /dev/null @@ -1,71 +0,0 @@ -<?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:paddingBottom="20dp" > - - <ImageView - android:layout_width="match_parent" - android:layout_height="match_parent" - android:id="@+id/onboarding_screen_background_image" - android:scaleType="centerCrop" - android:importantForAccessibility="no" /> - - <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" - android:layout_marginStart="@dimen/onboard_screen_side_padding" - android:layout_marginEnd="@dimen/onboard_screen_side_padding" /> - - <TextView - android:id="@id/onboarding_screen_content" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_above="@+id/onboard_next_button" - android:layout_marginTop="20dp" - android:textColor="@color/onboarding_primary_text_color" - android:layout_marginStart="@dimen/onboard_screen_side_padding" - android:layout_marginEnd="@dimen/onboard_screen_side_padding" /> - - <Button - android:id="@+id/onboard_skip_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignTop="@id/onboard_next_button" - android:layout_toStartOf="@id/onboard_next_button" - 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_alignParentEnd="true" - android:layout_alignParentBottom="true" - android:layout_marginBottom="5dp" - android:layout_marginEnd="@dimen/onboard_screen_side_padding" - android:text="@string/onboarding_next_button" - android:textColor="@color/onboarding_primary_text_color" - style="@android:style/Widget.Material.Button" /> - -</RelativeLayout> diff --git a/res/values/colors.xml b/res/values/colors.xml index da68061e9..76bc0938b 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -134,12 +134,6 @@ <color name="blocked_number_header_color">@color/dialer_theme_color</color> <color name="blocked_number_disabled_emergency_header_color">#616161</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> - <color name="onboarding_next_button_color">#ffffff</color> - <!-- Grey 700 --> <color name="call_detail_footer_text_color">#616161</color> <color name="call_detail_footer_icon_tint">@color/call_detail_footer_text_color</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 8ea7d1c0d..18f33d5f2 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -167,6 +167,4 @@ <dimen name="blocked_number_settings_description_text_size">16sp</dimen> <dimen name="call_type_icon_size">12dp</dimen> - - <dimen name="onboard_screen_side_padding">20dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index dd325bc4c..b5703c6bf 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -937,22 +937,4 @@ <!-- 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. [CHAR LIMIT=NONE]--> <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 [CHAR LIMIT=NONE]--> - <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 [CHAR LIMIT=NONE]--> - <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 [CHAR LIMIT=NONE]--> - <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 [CHAR LIMIT=NONE]--> - <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 [CHAR LIMIT=30]--> - <string name="onboarding_skip_button">Skip</string> - - <!-- The label of the button used to go to the next screen in the onboarding flow [CHAR LIMIT=30]--> - <string name="onboarding_next_button">Next</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 108f299d3..d3d160da4 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -115,15 +115,6 @@ <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> - <item name="android:colorButtonNormal">@color/onboarding_next_button_color</item> - <item name="colorButtonNormal">@color/onboarding_next_button_color</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 --> |