diff options
Diffstat (limited to 'java/com/android/incallui/res')
7 files changed, 7 insertions, 225 deletions
diff --git a/java/com/android/incallui/res/drawable/incall_background_gradient.xml b/java/com/android/incallui/res/drawable/incall_background_gradient.xml deleted file mode 100644 index 5dd927f0f..000000000 --- a/java/com/android/incallui/res/drawable/incall_background_gradient.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <gradient - android:angle="270" - android:startColor="@color/incall_background_gradient_top" - android:centerColor="@color/incall_background_gradient_middle" - android:endColor="@color/incall_background_gradient_bottom"/> -</shape> diff --git a/java/com/android/incallui/res/layout/caller_in_conference.xml b/java/com/android/incallui/res/layout/caller_in_conference.xml index 23bb28512..3f660c5b5 100644 --- a/java/com/android/incallui/res/layout/caller_in_conference.xml +++ b/java/com/android/incallui/res/layout/caller_in_conference.xml @@ -67,8 +67,8 @@ android:id="@+id/conferenceCallerStatus" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/SecondaryText" - android:textColor="@color/dialer_disabled_text_color" + style="@style/Dialer.TextAppearance.Secondary" + android:enabled="false" android:visibility="gone"/> <!-- Number --> @@ -93,12 +93,12 @@ android:id="@+id/conferenceCallerSeparate" android:layout_width="@dimen/conference_call_manager_button_dimension" android:layout_height="@dimen/conference_call_manager_button_dimension" - android:background="?android:selectableItemBackgroundBorderless" + android:background="?android:attr/selectableItemBackgroundBorderless" android:clickable="true" android:contentDescription="@string/goPrivate" android:scaleType="center" android:src="@drawable/ic_call_split_white_24dp" - android:tint="@color/icon_color_grey"/> + android:tint="?colorIcon"/> <!-- "Disconnect" button which terminates the connection with this caller. --> <ImageButton @@ -106,11 +106,11 @@ android:layout_width="@dimen/conference_call_manager_button_dimension" android:layout_height="@dimen/conference_call_manager_button_dimension" android:layout_marginStart="8dp" - android:background="?android:selectableItemBackgroundBorderless" + android:background="?android:attr/selectableItemBackgroundBorderless" android:clickable="true" android:contentDescription="@string/conference_caller_disconnect_content_description" android:scaleType="center" android:src="@drawable/quantum_ic_call_end_white_24" - android:tint="@color/icon_color_grey"/> + android:tint="?colorIcon"/> </LinearLayout> <!-- End of single list element --> diff --git a/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml b/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml index ab743eb89..2e40cabd3 100644 --- a/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml +++ b/java/com/android/incallui/res/layout/frag_rtt_request_dialog.xml @@ -70,7 +70,7 @@ android:layout_gravity="end" android:paddingStart="16dp" android:paddingEnd="16dp" - android:backgroundTint="@color/dialer_theme_color" + android:backgroundTint="?android:attr/colorPrimary" android:fontFamily="sans-serif-medium" android:stateListAnimator="@null" android:text="@string/rtt_button_accept_request" diff --git a/java/com/android/incallui/res/values/colors.xml b/java/com/android/incallui/res/values/colors.xml deleted file mode 100644 index 32da57b84..000000000 --- a/java/com/android/incallui/res/values/colors.xml +++ /dev/null @@ -1,70 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2013 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> - <color name="conference_call_manager_caller_name_text_color">#4d4d4d</color> - <!-- Used with some smaller texts in manage conference screen. --> - <color name="conference_call_manager_secondary_text_color">#999999</color> - - <color name="incall_dialpad_background">#ffffff</color> - - <!-- Background color for status bar. For portrait this will be ignored. --> - <color name="statusbar_background_color">@color/dialer_theme_color</color> - - <!-- 20% opacity, theme color. --> - <color name="incall_dialpad_touch_tint">@color/dialer_theme_color_20pct</color> - - <!-- Background colors for InCallUI. This is a set of colors which pass WCAG - AA and all have a contrast ratio over 5:1. - - These colors are also used by InCallUIMaterialColorMapUtils to generate - primary activity colors. - --> - <array name="background_colors"> - <item>#00796B</item> - <item>#3367D6</item> - <item>#303F9F</item> - <item>#7B1FA2</item> - <item>#C2185B</item> - <item>#C53929</item> - <item>#A52714</item> - </array> - - <!-- Darker versions of background_colors, two shades darker. These colors are used for the - status bar. --> - <array name="background_colors_dark"> - <item>#00695C</item> - <item>#2A56C6</item> - <item>#283593</item> - <item>#6A1B9A</item> - <item>#AD1457</item> - <item>#B93221</item> - <item>#841F10</item> - </array> - - <color name="incall_background_gradient_top">#E91141BB</color> - <color name="incall_background_gradient_middle">#E91141BB</color> - <color name="incall_background_gradient_bottom">#CC229FEB</color> - - <color name="incall_background_multiwindow">#E91141BB</color> - - <color name="incall_background_gradient_spam_top">#E5A30B0B</color> - <color name="incall_background_gradient_spam_middle">#D6C01111</color> - <color name="incall_background_gradient_spam_bottom">#B8E55135</color> - - <color name="incall_background_multiwindow_spam">#E9C22E2E</color> -</resources> diff --git a/java/com/android/incallui/res/values/dimens.xml b/java/com/android/incallui/res/values/dimens.xml deleted file mode 100644 index 5688169ef..000000000 --- a/java/com/android/incallui/res/values/dimens.xml +++ /dev/null @@ -1,44 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2013 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> - <!-- The InCallUI dialpad will sometimes want digits sizes that are different - from dialer. Note, these are the default sizes for small devices. Larger - screen sizes apply the values in values-sw360dp/dimens.xml. --> - <dimen name="incall_dialpad_key_number_margin_bottom">1dp</dimen> - <dimen name="incall_dialpad_digits_adjustable_text_size">20sp</dimen> - <dimen name="incall_dialpad_digits_adjustable_height">50dp</dimen> - <dimen name="incall_dialpad_key_letters_size_for_dual_alphabets">9sp</dimen> - <dimen name="incall_dialpad_key_letters_size_for_single_alphabet"> - @dimen/dialpad_key_letters_default_size_for_single_alphabet - </dimen> - <dimen name="incall_dialpad_key_numbers_size">36dp</dimen> - - <!-- Dimension used to possibly down-scale high-res photo into what is suitable - for notification's large icon. --> - <dimen name="notification_icon_size">64dp</dimen> - - <dimen name="conference_call_manager_button_dimension">48dp</dimen> - - <dimen name="return_to_call_initial_offset_y">120dp</dimen> - - <!-- Whether or not the landscape mode layout is currently being used --> - <bool name="is_layout_landscape">false</bool> - - <dimen name="video_call_lte_to_wifi_failed_do_not_show_text_size">16sp</dimen> - -</resources> diff --git a/java/com/android/incallui/res/values/strings.xml b/java/com/android/incallui/res/values/strings.xml index c7e5677c7..c18ee495e 100644 --- a/java/com/android/incallui/res/values/strings.xml +++ b/java/com/android/incallui/res/values/strings.xml @@ -16,11 +16,6 @@ --> <resources xmlns:tools="http://schemas.android.com/tools" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - - <!-- Official label of the phone app, as seen in "Manage Applications" - and other settings UIs. --> - <string name="phoneAppLabel" product="default">Phone</string> - <!-- MMI dialog strings --> <!-- Dialog label when an MMI code starts running --> diff --git a/java/com/android/incallui/res/values/styles.xml b/java/com/android/incallui/res/values/styles.xml deleted file mode 100644 index 269b72111..000000000 --- a/java/com/android/incallui/res/values/styles.xml +++ /dev/null @@ -1,91 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2013 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> - <!-- Theme for the InCallActivity activity. Should have a transparent background for the - circular reveal animation for a new outgoing call to work correctly. We don't just use - Theme.Black.NoTitleBar directly, since we want any popups or dialogs from the - InCallActivity to have the correct Material style. --> - <style name="Theme.InCallScreen" parent="@style/Theme.AppCompat.NoActionBar"> - <item name="android:textColorPrimary">#ffffff</item> - <item name="android:textColorSecondary">#DDFFFFFF</item> - <item name="android:colorPrimary">@color/dialer_theme_color</item> - <item name="android:colorPrimaryDark">@color/dialer_theme_color_dark</item> - - <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:navigationBarColor">@android:color/transparent</item> - <item name="android:windowDrawsSystemBarBackgrounds">true</item> - - <item name="dialpad_key_button_touch_tint">@color/incall_dialpad_touch_tint</item> - <item name="dialpad_style">@style/InCallDialpad</item> - <item name="android:windowAnimationStyle">@null</item> - <item name="android:alertDialogTheme">@style/AlertDialogTheme</item> - - <item name="android:windowBackground">@drawable/incall_background_gradient</item> - <item name="android:windowShowWallpaper">true</item> - </style> - - <style name="Theme.InCallScreen.ManageConference" parent="DialerThemeBase"> - </style> - - <style name="InCallDialpad" parent="Dialpad.Light"> - <item name="dialpad_key_number_margin_bottom"> - @dimen/incall_dialpad_key_number_margin_bottom - </item> - <item name="dialpad_digits_adjustable_text_size"> - @dimen/incall_dialpad_digits_adjustable_text_size - </item> - <item name="dialpad_digits_adjustable_height"> - @dimen/incall_dialpad_digits_adjustable_height - </item> - <item name="dialpad_key_letters_size_for_dual_alphabets"> - @dimen/incall_dialpad_key_letters_size_for_dual_alphabets - </item> - <item name="dialpad_key_letters_size_for_single_alphabet"> - @dimen/incall_dialpad_key_letters_size_for_single_alphabet - </item> - <item name="dialpad_key_numbers_size"> - @dimen/incall_dialpad_key_numbers_size - </item> - <item name="dialpad_end_key_spacing"> - @dimen/incall_end_call_spacing - </item> - <item name="dialpad_elevation">10dp</item> - </style> - - <style name="AfterCallNotificationTheme" parent="@android:style/Theme.Material.Light.Dialog"> - <!-- This colorAccent is to style checkboxes in the dialogs --> - <item name="colorAccent">@color/dialer_theme_color</item> - <!-- This is needed to make any alert dialogs in this activity take up minimum space --> - <item name="android:alertDialogTheme">@style/AfterCallDialogStyle</item> - </style> - - <style name="AfterCallDialogStyle" parent="@android:style/Theme.Material.Light.Dialog"> - <!-- This colorAccent is to style text in the dialogs --> - <item name="android:colorAccent">@color/dialer_theme_color</item> - </style> - - <style name="Theme.Incall.DialogHolder" parent="Theme.AppCompat.Translucent"> - <item name="android:windowBackground">@android:color/transparent</item> - <item name="android:windowActivityTransitions">false</item> - - <item name="android:statusBarColor">@android:color/transparent</item> - <item name="android:navigationBarColor">@android:color/transparent</item> - <item name="android:windowDrawsSystemBarBackgrounds">true</item> - </style> - -</resources> |