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/dialpadview | |
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/dialpadview')
5 files changed, 8 insertions, 20 deletions
diff --git a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml index 7f82d74fe..66013c64c 100644 --- a/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml +++ b/java/com/android/dialer/dialpadview/res/layout-land/dialpad_fragment.xml @@ -76,7 +76,7 @@ android:contentDescription="@string/description_dial_button" android:src="@drawable/quantum_ic_call_white_24" android:visibility="invisible" - app:backgroundTint="@color/dialpad_fab_green" + app:backgroundTint="@color/dialer_call_green" app:elevation="@dimen/floating_action_button_translation_z"/> </RelativeLayout> </LinearLayout> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml index d3ebeb06c..3497d2ab5 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_fragment.xml @@ -66,9 +66,9 @@ android:layout_centerHorizontal="true" android:contentDescription="@string/description_dial_button" android:src="@drawable/quantum_ic_call_vd_theme_24" - android:tint="#ffffff" + android:tint="?colorIconOnUnthemedDarkBackground" android:visibility="invisible" - app:backgroundTint="@color/dialpad_fab_green" - app:colorControlNormal="#ffffff" + app:backgroundTint="@color/dialer_call_green" + app:colorControlNormal="?colorIconOnUnthemedDarkBackground" app:elevation="@dimen/floating_action_button_translation_z"/> </view> diff --git a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml index 69d23a9b6..9953fa3b4 100644 --- a/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml +++ b/java/com/android/dialer/dialpadview/res/layout/dialpad_view_unthemed.xml @@ -81,7 +81,7 @@ android:contentDescription="@string/description_dialpad_back" android:gravity="center" android:src="@drawable/quantum_ic_close_white_24" - android:tint="?attr/dialpad_icon_tint" + android:tint="?colorIcon" android:tintMode="src_in" android:visibility="gone"/> @@ -96,7 +96,7 @@ android:contentDescription="@string/description_dialpad_overflow" android:gravity="center" android:src="@drawable/quantum_ic_more_vert_white_24" - android:tint="?attr/dialpad_icon_tint" + android:tint="?colorIcon" android:tintMode="src_in" android:visibility="gone"/> <FrameLayout android:layout_width="0dp" @@ -108,7 +108,7 @@ android:focusable="false" android:gravity="center" android:textSize="14sp" - android:textColor="@color/secondary_text_color" + android:textColor="?colorIcon" android:visibility="gone" /> <com.android.dialer.dialpadview.DigitsEditText @@ -142,7 +142,7 @@ android:contentDescription="@string/description_delete_button" android:src="@drawable/quantum_ic_backspace_white_24" android:state_enabled="false" - android:tint="?attr/dialpad_icon_tint" + android:tint="?colorIcon" android:tintMode="src_in"/> </LinearLayout> diff --git a/java/com/android/dialer/dialpadview/theme/res/values/attr.xml b/java/com/android/dialer/dialpadview/theme/res/values/attr.xml index 99707aa1d..9cd225ad2 100644 --- a/java/com/android/dialer/dialpadview/theme/res/values/attr.xml +++ b/java/com/android/dialer/dialpadview/theme/res/values/attr.xml @@ -32,8 +32,6 @@ <attr format="color" name="dialpad_text_color"/> <attr format="color" name="dialpad_text_color_primary"/> <attr format="color" name="dialpad_text_color_secondary"/> - <attr format="color" name="dialpad_icon_tint"/> - <attr format="color" name="dialpad_voicemail_tint"/> <attr format="color" name="dialpad_background"/> <attr format="dimension" name="dialpad_elevation"/> </declare-styleable> diff --git a/java/com/android/dialer/dialpadview/theme/res/values/styles.xml b/java/com/android/dialer/dialpadview/theme/res/values/styles.xml index 408a33dd1..04ebb1b13 100644 --- a/java/com/android/dialer/dialpadview/theme/res/values/styles.xml +++ b/java/com/android/dialer/dialpadview/theme/res/values/styles.xml @@ -36,16 +36,6 @@ <item name="dialpad_text_color">?android:attr/textColorSecondary</item> <item name="dialpad_text_color_primary">?android:attr/colorPrimary</item> <item name="dialpad_text_color_secondary">?android:attr/textColorSecondary</item> - <item name="dialpad_icon_tint">?colorIcon</item> - <item name="dialpad_voicemail_tint">?colorIcon</item> <item name="dialpad_background">?android:attr/colorBackgroundFloating</item> </style> - - <style name="Dialpad.Dark"> - <item name="dialpad_text_color">@android:color/white</item> - <item name="dialpad_text_color_primary">@android:color/white</item> - <item name="dialpad_text_color_secondary">#ffd4d6d7</item> - <item name="dialpad_icon_tint">@android:color/white</item> - <item name="dialpad_background">#00000000</item> - </style> </resources>
\ No newline at end of file |