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/widget/res/layout | |
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/widget/res/layout')
5 files changed, 9 insertions, 14 deletions
diff --git a/java/com/android/dialer/widget/res/layout/contact_photo_view.xml b/java/com/android/dialer/widget/res/layout/contact_photo_view.xml index 320d06b98..e13388649 100644 --- a/java/com/android/dialer/widget/res/layout/contact_photo_view.xml +++ b/java/com/android/dialer/widget/res/layout/contact_photo_view.xml @@ -68,7 +68,7 @@ android:layout_height="13dp" android:layout_gravity="center" android:src="@drawable/quantum_ic_rtt_vd_theme_24" - android:tint="@android:color/white" + android:tint="?android:attr/colorBackground" tools:ignore="ContentDescription"/> </FrameLayout> </FrameLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml index 0540a00bc..a75176a22 100644 --- a/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml +++ b/java/com/android/dialer/widget/res/layout/dialer_toolbar.xml @@ -28,19 +28,15 @@ android:layout_height="wrap_content" android:gravity="top" android:textSize="@dimen/toolbar_title_text_size" - android:textColor="?android:attr/colorBackground" - android:fontFamily="sans-serif-medium" - android:maxLines="1" - android:ellipsize="end"/> + android:textColor="?android:attr/textColorPrimaryInverse" + style="@style/Dialer.TextAppearance.Header2"/> <TextView android:id="@+id/subtitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="@dimen/toolbar_subtitle_text_size" - android:textColor="?android:attr/colorBackground" + android:textColor="?android:attr/textColorPrimaryInverse" android:visibility="gone" - android:maxLines="1" - android:ellipsize="end"/> + style="@style/Dialer.TextAppearance.Secondary.Ellipsize"/> </LinearLayout> </merge>
\ No newline at end of file diff --git a/java/com/android/dialer/widget/res/layout/empty_content_view.xml b/java/com/android/dialer/widget/res/layout/empty_content_view.xml index 9aac6f48f..57bb2fd5c 100644 --- a/java/com/android/dialer/widget/res/layout/empty_content_view.xml +++ b/java/com/android/dialer/widget/res/layout/empty_content_view.xml @@ -30,7 +30,7 @@ android:paddingLeft="16dp" android:paddingRight="16dp" android:gravity="center_horizontal|top" - android:textColor="@color/empty_list_text_color" + android:textColor="?android:attr/textColorSecondary" android:textSize="@dimen/empty_list_message_text_size"/> <TextView diff --git a/java/com/android/dialer/widget/res/layout/fragment_message.xml b/java/com/android/dialer/widget/res/layout/fragment_message.xml index 388a8d55a..1004fa8f9 100644 --- a/java/com/android/dialer/widget/res/layout/fragment_message.xml +++ b/java/com/android/dialer/widget/res/layout/fragment_message.xml @@ -52,7 +52,7 @@ android:padding="@dimen/textview_item_padding" android:textSize="@dimen/message_item_text_size" android:hint="@string/custom_message_hint" - android:textColor="@color/dialer_primary_text_color" + android:textColor="?android:attr/textColorPrimary" android:textColorHint="?android:attr/textColorHint" android:background="?android:attr/colorBackground" android:textCursorDrawable="@drawable/edittext_custom_cursor" diff --git a/java/com/android/dialer/widget/res/layout/selectable_text_view.xml b/java/com/android/dialer/widget/res/layout/selectable_text_view.xml index 9cdb162b6..5e13d9a5e 100644 --- a/java/com/android/dialer/widget/res/layout/selectable_text_view.xml +++ b/java/com/android/dialer/widget/res/layout/selectable_text_view.xml @@ -19,7 +19,6 @@ android:id="@+id/selectable_text_view" android:layout_width="match_parent" android:layout_height="wrap_content" - android:textSize="16sp" - android:textColor="@color/dialer_primary_text_color" + style="@style/Dialer.TextAppearance.Primary" android:padding="16dp" - android:background="@drawable/ripple_material_light"/>
\ No newline at end of file + android:background="?android:selectableItemBackground"/>
\ No newline at end of file |