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/common/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/common/res/values')
5 files changed, 258 insertions, 0 deletions
diff --git a/java/com/android/dialer/theme/common/res/values/colors.xml b/java/com/android/dialer/theme/common/res/values/colors.xml new file mode 100644 index 000000000..8f5976703 --- /dev/null +++ b/java/com/android/dialer/theme/common/res/values/colors.xml @@ -0,0 +1,33 @@ +<?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="dialer_call_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> + + <color name="dialer_red">#C53929</color> + + <!-- Legacy --> + <color name="blue_grey_100">#CFD8DC</color> +</resources>
\ No newline at end of file diff --git a/java/com/android/dialer/theme/common/res/values/dimens.xml b/java/com/android/dialer/theme/common/res/values/dimens.xml new file mode 100644 index 000000000..88b8a0423 --- /dev/null +++ b/java/com/android/dialer/theme/common/res/values/dimens.xml @@ -0,0 +1,57 @@ +<?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> +</resources> diff --git a/java/com/android/dialer/theme/common/res/values/strings.xml b/java/com/android/dialer/theme/common/res/values/strings.xml new file mode 100644 index 000000000..7d7209207 --- /dev/null +++ b/java/com/android/dialer/theme/common/res/values/strings.xml @@ -0,0 +1,47 @@ +<!-- + ~ 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/common/res/values/styles.xml b/java/com/android/dialer/theme/common/res/values/styles.xml new file mode 100644 index 000000000..2c6446ca1 --- /dev/null +++ b/java/com/android/dialer/theme/common/res/values/styles.xml @@ -0,0 +1,34 @@ +<?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 + --> +<resources> + <!-- TODO(calderwoodra): Delete this once new call log and new voicemail ship. --> + <!-- Ideally we would make a callLogCardStyle attribute but we don't want to expand dialer/app --> + <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> + + <!-- 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> +</resources>
\ No newline at end of file diff --git a/java/com/android/dialer/theme/common/res/values/text_styles.xml b/java/com/android/dialer/theme/common/res/values/text_styles.xml new file mode 100644 index 000000000..9cf4a7689 --- /dev/null +++ b/java/com/android/dialer/theme/common/res/values/text_styles.xml @@ -0,0 +1,87 @@ +<?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 + --> +<resources> + <!-- + - These are official UX approved text styles and all TextViews should inherit from one of these. + - If you think you don't see the style you need, double check with your UX designer. + --> + <style name="Dialer.TextAppearance.Header1" parent="TextAppearance.AppCompat"> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textSize">18sp</item> + <item name="android:fontFamily">sans-serif-regular</item> + </style> + + <style name="Dialer.TextAppearance.Header2" parent="TextAppearance.AppCompat"> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textSize">16sp</item> + <item name="android:fontFamily">sans-serif-medium</item> + </style> + + <style name="Dialer.TextAppearance.Primary" parent="TextAppearance.AppCompat"> + <item name="android:textColor">?android:attr/textColorPrimary</item> + <item name="android:textSize">16sp</item> + <item name="android:fontFamily">sans-serif-regular</item> + </style> + + <style name="Dialer.TextAppearance.Secondary" parent="TextAppearance.AppCompat"> + <item name="android:textColor">?android:attr/textColorSecondary</item> + <item name="android:textSize">14sp</item> + <item name="android:fontFamily">sans-serif-regular</item> + </style> + + <style name="Dialer.TextAppearance.Secondary2" parent="TextAppearance.AppCompat"> + <item name="android:textColor">?android:attr/textColorSecondary</item> + <item name="android:textSize">12sp</item> + <item name="android:fontFamily">sans-serif-regular</item> + </style> + + <style name="Dialer.TextAppearance.OVERLINE" parent="TextAppearance.AppCompat"> + <item name="android:textColor">?android:attr/textColorSecondary</item> + <item name="android:textSize">14sp</item> + <item name="android:fontFamily">sans-serif-medium</item> + </style> + + <style name="Dialer.TextAppearance.Header1.Ellipsize" parent="Dialer.TextAppearance.Header1"> + <item name="android:ellipsize">end</item> + <item name="android:maxLines">1</item> + </style> + + <style name="Dialer.TextAppearance.Header2.Ellipsize" parent="Dialer.TextAppearance.Header2"> + <item name="android:ellipsize">end</item> + <item name="android:maxLines">1</item> + </style> + + <style name="Dialer.TextAppearance.Primary.Ellipsize" parent="Dialer.TextAppearance.Primary"> + <item name="android:ellipsize">end</item> + <item name="android:maxLines">1</item> + </style> + + <style name="Dialer.TextAppearance.Secondary.Ellipsize" parent="Dialer.TextAppearance.Secondary"> + <item name="android:ellipsize">end</item> + <item name="android:maxLines">1</item> + </style> + + <style name="Dialer.TextAppearance.Secondary2.Ellipsize" parent="Dialer.TextAppearance.Secondary"> + <item name="android:ellipsize">end</item> + <item name="android:maxLines">1</item> + </style> + + <style name="Dialer.TextAppearance.OVERLINE.Ellipsize" parent="Dialer.TextAppearance.OVERLINE"> + <item name="android:ellipsize">end</item> + <item name="android:maxLines">1</item> + </style> +</resources>
\ No newline at end of file |