diff options
author | calderwoodra <calderwoodra@google.com> | 2018-05-22 15:30:39 -0700 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-05-29 23:24:53 -0700 |
commit | c5c42189eeab0389a94717de9a66c6d00068e8bf (patch) | |
tree | fbecd02f5176af6c8c2ac6bd620e117d341e62bf /java/com/android/dialer/theme/res/values | |
parent | 4efd0ebf003e985e7cbe40d8ffd9f7ff227a9611 (diff) |
Began implementation of Dialer dark theme.
- README on how to properly theme Dialer going forward.
- Migrated all widgets to use global colors.
- Removed all activity and application themes where it wasn't necessary.
- Added themeing test rule for Espresso tests.
Bug: 79883035
Test: tap
PiperOrigin-RevId: 197634256
Change-Id: I4b7d94d45aeeb59d484b0069fdd1e200a654910b
Diffstat (limited to 'java/com/android/dialer/theme/res/values')
5 files changed, 0 insertions, 304 deletions
diff --git a/java/com/android/dialer/theme/res/values/colors.xml b/java/com/android/dialer/theme/res/values/colors.xml deleted file mode 100644 index 7c62a2103..000000000 --- a/java/com/android/dialer/theme/res/values/colors.xml +++ /dev/null @@ -1,31 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2012 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 - --> -<!-- The colors in this file aren't configured at the theme level. --> -<resources> - <color name="dialpad_fab_green">#00C853</color> - <color name="dialer_end_call_button_color">#BD2A2A</color> - <color name="dialer_divider_line_color">#D8D8D8</color> - <color name="dialer_link_color">#2A56C6</color> - - <!-- Colors for the notification actions --> - <color name="notification_action_accept">#097138</color> - <color name="notification_action_dismiss">#A52714</color> - <color name="notification_action_answer_video">#097138</color> - - <!-- Legacy --> - <color name="blue_grey_100">#CFD8DC</color> -</resources>
\ No newline at end of file diff --git a/java/com/android/dialer/theme/res/values/colors_dialer_light.xml b/java/com/android/dialer/theme/res/values/colors_dialer_light.xml deleted file mode 100644 index ea8247414..000000000 --- a/java/com/android/dialer/theme/res/values/colors_dialer_light.xml +++ /dev/null @@ -1,55 +0,0 @@ -<!-- - ~ 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 - --> -<resources> - <!-- Note: The following colors are used in the Dialer settings screens. Since Dialer's settings - link into the Telephony settings as well, changes to these colors should be mirrored in - Telephony: - - Android source path: packages/apps/PhoneCommon/res/values/colors.xml - - Local: dialer_theme_color Android Source: dialer_theme_color - - Local: dialer_theme_color_dark Android Source: dialer_theme_color_dark - Android source path: packages/services/Telecomm/res/values/colors.xml - - Local: dialer_theme_color Android Source: theme_color - - Local: dialer_theme_color_dark Android Source: dialer_settings_color_dark - --> - <!-- Essential theme colors --> - <color name="dialer_theme_color">#2A56C6</color> - <color name="dialer_theme_color_dark">#1C3AA9</color> - <color name="dialer_secondary_color">#F50057</color> - <color name="dialer_theme_color_20pct">#332A56C6</color> - - <!-- Text colors --> - <color name="dialer_primary_text_color_enabled">#212121</color> - <color name="dialer_secondary_text_color_enabled">#636363</color> - <color name="dialer_text_color_disabled">#9E9E9E</color> - <color name="dialer_text_hint_color">#DE78909C</color> - <color name="dialer_primary_text_color_inverse">#FFFFFF</color> - <color name="dialer_secondary_text_color_inverse">#DDFFFFFF</color> - <color name="dialer_snackbar_action_text_color">#4285F4</color> - - <!-- Colors for the setting text. --> - <!-- TODO(a bug): investigate if these should be removed. --> - <color name="setting_primary_color">@color/dialer_primary_text_color</color> - <color name="setting_secondary_color">@color/dialer_secondary_text_color</color> - <color name="setting_disabled_color">#AAAAAA</color> - - <!-- Background colors --> - <color name="dialer_background_light">#FAFAFA</color> - <color name="dialer_background_floating_light">#FFFFFF</color> - - <!-- Other useful colors --> - <color name="dialer_icon_color">#89000000</color> -</resources> diff --git a/java/com/android/dialer/theme/res/values/dimens.xml b/java/com/android/dialer/theme/res/values/dimens.xml deleted file mode 100644 index 4abe4b53a..000000000 --- a/java/com/android/dialer/theme/res/values/dimens.xml +++ /dev/null @@ -1,61 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2012 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 - --> -<resources> - <dimen name="call_log_action_icon_margin_start">16dp</dimen> - <dimen name="call_log_action_icon_dimen">24dp</dimen> - <dimen name="call_log_action_horizontal_padding">24dp</dimen> - - <dimen name="call_log_primary_text_size">16sp</dimen> - <dimen name="call_log_detail_text_size">12sp</dimen> - <dimen name="call_log_day_group_heading_size">14sp</dimen> - <dimen name="call_log_voicemail_transcription_text_size">14sp</dimen> - <!-- Height of the call log actions section for each call log entry --> - <dimen name="call_log_action_height">48dp</dimen> - <dimen name="call_log_day_group_padding_top">15dp</dimen> - <dimen name="call_log_day_group_padding_bottom">9dp</dimen> - - <!-- Height of the actionBar - this is 8dps bigger than the platform standard to give more - room to the search box--> - <dimen name="action_bar_height">56dp</dimen> - <dimen name="action_bar_height_large">64dp</dimen> - <dimen name="action_bar_elevation">3dp</dimen> - <dimen name="tab_height">48dp</dimen> - <!-- actionbar height + tab height --> - <dimen name="actionbar_contentInsetStart">72dp</dimen> - - <dimen name="call_log_icon_margin">2dp</dimen> - - <item name="alpha_enabled" format="float" type="dimen">1.0</item> - <item name="alpha_hiden" format="float" type="dimen">0.54</item> - - <!-- Minimum height required for all row elements in Dialer lists. --> - <dimen name="dialer_list_item_min_height">56dp</dimen> - - <!-- Minimum a11y height and width required for all touch targets. --> - <dimen name="dialer_touch_target_min_size">48dp</dimen> - - <!-- Minimum width for material compliant buttons. --> - <dimen name="dialer_button_min_width">72dp</dimen> - - <!-- Padding to be applied to the bottom of lists to make space for the floating action - button --> - <dimen name="floating_action_button_list_bottom_padding">88dp</dimen> - - <!-- TODO(a bug): add a comment here --> - <dimen name="primary_text_size">16sp</dimen> - <dimen name="secondary_text_size">14sp</dimen> -</resources> diff --git a/java/com/android/dialer/theme/res/values/strings.xml b/java/com/android/dialer/theme/res/values/strings.xml deleted file mode 100644 index 7d7209207..000000000 --- a/java/com/android/dialer/theme/res/values/strings.xml +++ /dev/null @@ -1,47 +0,0 @@ -<!-- - ~ Copyright (C) 2016 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 - --> - -<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <!-- String used to display calls from unknown numbers in the call log --> - <string name="unknown">Unknown</string> - - <!-- String to identify an unknown/restricted callers. ex. "Unknown 1", "Restricted 2", ect. --> - <string name="unknown_counter"> - <xliff:g id="unknown">%1$s</xliff:g> <xliff:g id="id">%2$d</xliff:g> - </string> - - <!-- String used to display calls from pay phone in the call log --> - <string name="payphone">Payphone</string> - - <!-- String used to display calls from emergency numbers in the call log and incallui --> - <string name="emergency_number">Emergency number</string> - - <!-- Title for the activity that dials the phone. This is the name - used in the Launcher icon. --> - <string name="launcherActivityLabel">Phone</string> - - <!-- Label shown on the 'positive' button for the dialog. Indicates that the call will proceed --> - <string name="call">Call</string> - - <!-- Displayed when handover from WiFi to Lte occurs during a video call --> - <string name="video_call_lte_to_wifi_handover_toast">Continuing call using Wi\u2011Fi\u2026</string> - - <!-- String used to build a phone number type and phone number string. - Example: Mobile 650-555-1212 --> - <string name="call_subject_type_and_number"> - <xliff:g example="Mobile" id="type">%1$s</xliff:g> <xliff:g example="(650) 555-1212" id="number">%2$s</xliff:g> - </string> -</resources> diff --git a/java/com/android/dialer/theme/res/values/styles_dialer_light.xml b/java/com/android/dialer/theme/res/values/styles_dialer_light.xml deleted file mode 100644 index 6ce3b1960..000000000 --- a/java/com/android/dialer/theme/res/values/styles_dialer_light.xml +++ /dev/null @@ -1,110 +0,0 @@ -<!-- - ~ Copyright (C) 2012 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 - --> - -<resources> - - <style name="CallLogCardStyle" parent="CardView"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">wrap_content</item> - <item name="android:layout_margin">4dp</item> - <item name="android:baselineAligned">false</item> - <item name="cardCornerRadius">2dp</item> - <item name="cardBackgroundColor">?android:attr/colorBackgroundFloating</item> - </style> - - <!-- TODO(a bug): properly document this or delete it --> - <style name="Theme.PreCall.DialogHolder" parent="Dialer.ThemeBase.NoActionBar"> - <item name="android:windowBackground">@android:color/transparent</item> - <item name="android:windowActivityTransitions">false</item> - <item name="android:windowIsTranslucent">true</item> - - <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:navigationBarColor">@android:color/transparent</item> - <item name="android:windowDrawsSystemBarBackgrounds">true</item> - </style> - - <!-- Style applied to the "Settings" screen. Keep in sync with SettingsLight in Telephony. --> - <style name="SettingsStyle" parent="Dialer.ThemeBase"> - <!-- Setting text. --> - <item name="android:textColorPrimary">@color/settings_text_color_primary</item> - <!-- Setting description. --> - <item name="android:textColorSecondary">@color/settings_text_color_secondary</item> - <item name="android:windowBackground">?android:attr/colorBackground</item> - <item name="android:colorAccent">?android:attr/colorPrimary</item> - <item name="android:textColorLink">?android:attr/colorPrimary</item> - </style> - - <style name="AlertDialogTheme" parent="Theme.AppCompat.Light.Dialog.Alert"> - <!-- TODO(a bug): figure out why ?android:attr/colorPrimary doesn't work here --> - <item name="colorAccent">@color/dialer_theme_color</item> - </style> - - <style name="TextActionStyle"> - <item name="android:layout_width">wrap_content</item> - <item name="android:layout_height">@dimen/call_log_action_height</item> - <item name="android:gravity">end|center_vertical</item> - <item name="android:paddingStart">@dimen/call_log_action_horizontal_padding</item> - <item name="android:paddingEnd">@dimen/call_log_action_horizontal_padding</item> - <item name="android:textColor">?android:attr/colorPrimary</item> - <item name="android:fontFamily">"sans-serif-medium"</item> - <item name="android:focusable">true</item> - <item name="android:singleLine">true</item> - <item name="android:textAllCaps">true</item> - </style> - - <style name="DialerButtonTextStyle" parent="@android:style/TextAppearance.Material.Widget.Button"> - <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> - </style> - - <style name="DialerActionBarBaseStyle" - parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse"> - <item name="android:background">?android:attr/colorPrimary</item> - <item name="background">?android:attr/colorPrimary</item> - </style> - - <!-- This Checkbox style helps align checkboxes with the common list element layout(Image + text) --> - <style name="DialerCheckboxStyle" parent="Widget.AppCompat.CompoundButton.CheckBox"> - <item name="android:layout_marginStart">20dp</item> - <item name="android:paddingLeft">12dp</item> - </style> - - <style name="Dialer.TextAppearance.Header" parent="TextAppearance.AppCompat"> - <item name="android:textColor">?android:attr/textColorPrimary</item> - <item name="android:textSize">20sp</item> - <item name="android:ellipsize">end</item> - <item name="android:maxLines">1</item> - </style> - - <style name="Dialer.TextAppearance.Primary" parent="TextAppearance.AppCompat"> - <item name="android:textColor">?android:attr/textColorPrimary</item> - <item name="android:textSize">@dimen/primary_text_size</item> - <item name="android:ellipsize">end</item> - <item name="android:maxLines">1</item> - </style> - - <style name="Dialer.TextAppearance.Secondary" parent="TextAppearance.AppCompat"> - <item name="android:textColor">?android:attr/textColorSecondary</item> - <item name="android:textSize">@dimen/secondary_text_size</item> - <item name="android:ellipsize">end</item> - <item name="android:maxLines">1</item> - </style> - - <style name="SubHeader" parent="TextAppearance.AppCompat"> - <item name="android:textColor">#212121</item> - <item name="android:textSize">14sp</item> - <item name="android:lineSpacingMultiplier">1.1</item> - </style> -</resources> |