diff options
author | Eric Erfanian <erfanian@google.com> | 2018-05-30 16:17:27 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-05-30 16:17:27 +0000 |
commit | 2c3d81eeac82472d06027bc65d661e16735c8608 (patch) | |
tree | 293aeb0012d8db8f3f4606a75a422cf4da328477 /java/com/android/dialer/speeddial | |
parent | 4efd0ebf003e985e7cbe40d8ffd9f7ff227a9611 (diff) | |
parent | 152c3fd58f83a1882bcdc8bc55f46bbb8f3173c9 (diff) |
Merge changes Ica13ee39,I5e0fedc8,I8e7efad0,I0ecc1f91,Iee1e658a, ...
* changes:
Drop maps.impl from packages.mk
Check if ID column is null before retrieving data from the smart dial database.
Rename theme/private to theme/hidden.
Some improvements to the answer fragment layouts.
Better a11y for the bottom sheet.
Fix a few UI bugs.
Log IMS video call available state
Better a11y for contact badge in the new call log.
Use lookup key to determine the letter tile color
Use Dialer Light Theme for SpeakEasyFragment
Better a11y for new call log entries.
Use Maps SDK lite mode instead of static API for emergency call.
Updating locations where PrimaryInfo#setPhoto is used to also PrimaryInfo#setPhotoUri for new GlidePhotoManager implementation. As part of this addition, we also are cleaning the setPhoto(null) because this is not explicitly needed.
Converted ThemeUtil into a DaggerModule.
Delete AppCompatConstants
Remove photo support in PhoneNumberService
Began implementation of Dialer dark theme.
Diffstat (limited to 'java/com/android/dialer/speeddial')
7 files changed, 9 insertions, 35 deletions
diff --git a/java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml b/java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml deleted file mode 100644 index 2b36457fc..000000000 --- a/java/com/android/dialer/speeddial/res/drawable/context_menu_background.xml +++ /dev/null @@ -1,26 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- - ~ Copyright (C) 2017 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 - --> - -<shape xmlns:android="http://schemas.android.com/apk/res/android"> - <corners - android:bottomRightRadius="@dimen/speed_dial_context_menu_corner_radius" - android:topRightRadius="@dimen/speed_dial_context_menu_corner_radius" - android:bottomLeftRadius="@dimen/speed_dial_context_menu_corner_radius" - android:topLeftRadius="@dimen/speed_dial_context_menu_corner_radius"/> - <solid android:color="?android:attr/colorBackground"/> - <stroke android:color="#0333" android:width="2dp"/> -</shape>
\ No newline at end of file diff --git a/java/com/android/dialer/speeddial/res/drawable/context_menu_contact_icon.xml b/java/com/android/dialer/speeddial/res/drawable/context_menu_contact_icon.xml index 73260b156..ee9cde1db 100644 --- a/java/com/android/dialer/speeddial/res/drawable/context_menu_contact_icon.xml +++ b/java/com/android/dialer/speeddial/res/drawable/context_menu_contact_icon.xml @@ -18,7 +18,7 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <item> <shape android:shape="oval"> - <solid android:color="@color/secondary_text_color"/> + <solid android:color="?colorIcon"/> <size android:width="24dp" android:height="24dp"/> </shape> </item> diff --git a/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml index e395d4bd6..0923c5267 100644 --- a/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml +++ b/java/com/android/dialer/speeddial/res/layout/disambig_dialog_layout.xml @@ -32,7 +32,7 @@ android:elevation="1dp" android:text="@string/speed_dial_disambig_dialog_title" android:background="?android:attr/colorBackgroundFloating" - style="@style/Dialer.TextAppearance.Header"/> + style="@style/Dialer.TextAppearance.Header2"/> <com.android.dialer.widget.MaxHeightScrollView android:id="@+id/disambig_scrollview" diff --git a/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml b/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml index 57f8885ff..e289bb794 100644 --- a/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml +++ b/java/com/android/dialer/speeddial/res/layout/fragment_speed_dial.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:clipToPadding="false" - android:background="?android:attr/colorBackgroundFloating" + android:background="?android:attr/colorBackground" android:paddingBottom="@dimen/floating_action_button_list_bottom_padding"/> <com.android.dialer.widget.EmptyContentView diff --git a/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml b/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml index 96532fb82..4e010c279 100644 --- a/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml +++ b/java/com/android/dialer/speeddial/res/layout/suggestion_row_layout.xml @@ -57,7 +57,7 @@ android:layout_centerVertical="true" android:layout_alignParentEnd="true" android:scaleType="center" - android:tint="@color/secondary_text_color" + android:tint="?colorIcon" android:src="@drawable/quantum_ic_more_vert_white_24" android:background="?android:attr/selectableItemBackgroundBorderless" android:contentDescription="@string/content_description_overflow"/> diff --git a/java/com/android/dialer/speeddial/res/menu/starred_contact_context_menu.xml b/java/com/android/dialer/speeddial/res/menu/starred_contact_context_menu.xml index 0143498e1..2ff2524e6 100644 --- a/java/com/android/dialer/speeddial/res/menu/starred_contact_context_menu.xml +++ b/java/com/android/dialer/speeddial/res/menu/starred_contact_context_menu.xml @@ -24,25 +24,25 @@ android:id="@+id/voice_call_container" android:title="@string/contact_menu_voice_call" android:icon="@drawable/quantum_ic_phone_vd_theme_24" - android:iconTint="@color/secondary_text_color"/> + android:iconTint="?colorIcon"/> <item android:id="@+id/video_call_container" android:title="@string/contact_menu_video_call" android:icon="@drawable/quantum_ic_videocam_vd_theme_24" - android:iconTint="@color/secondary_text_color"/> + android:iconTint="?colorIcon"/> <item android:id="@+id/send_message_container" android:title="@string/contact_menu_message" android:icon="@drawable/quantum_ic_message_vd_theme_24" - android:iconTint="@color/secondary_text_color"/> + android:iconTint="?colorIcon"/> <item android:id="@+id/remove_container" android:title="@string/contact_menu_remove" android:icon="@drawable/quantum_ic_close_vd_theme_24" - android:iconTint="@color/secondary_text_color"/> + android:iconTint="?colorIcon"/> <item android:id="@+id/contact_info_container" diff --git a/java/com/android/dialer/speeddial/res/values/styles.xml b/java/com/android/dialer/speeddial/res/values/styles.xml index 38f31c3ed..99e6e3c73 100644 --- a/java/com/android/dialer/speeddial/res/values/styles.xml +++ b/java/com/android/dialer/speeddial/res/values/styles.xml @@ -16,7 +16,7 @@ --> <resources> <style name="SpeedDialContextMenuItem" parent="SpeedDialContextMenuItem.NoDrawableTint"> - <item name="android:drawableTint">@color/secondary_text_color</item> + <item name="android:drawableTint">?colorIcon</item> </style> <style name="SpeedDialContextMenuItem.NoDrawableTint" parent="Dialer.TextAppearance.Secondary"> |