diff options
Diffstat (limited to 'java/com/android/dialer/calldetails')
9 files changed, 35 insertions, 37 deletions
diff --git a/java/com/android/dialer/calldetails/AndroidManifest.xml b/java/com/android/dialer/calldetails/AndroidManifest.xml index 54d9f2fad..cea106a74 100644 --- a/java/com/android/dialer/calldetails/AndroidManifest.xml +++ b/java/com/android/dialer/calldetails/AndroidManifest.xml @@ -20,14 +20,12 @@ <activity android:label="@string/call_details" android:exported="false" - android:name="com.android.dialer.calldetails.OldCallDetailsActivity" - android:theme="@style/Dialer.ThemeBase.NoActionBar"> + android:name="com.android.dialer.calldetails.OldCallDetailsActivity"> </activity> <activity android:label="@string/call_details" android:exported="false" - android:name="com.android.dialer.calldetails.CallDetailsActivity" - android:theme="@style/Dialer.ThemeBase.NoActionBar"> + android:name="com.android.dialer.calldetails.CallDetailsActivity"> </activity> </application> </manifest> diff --git a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java index 4de7af796..05957ae80 100644 --- a/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java +++ b/java/com/android/dialer/calldetails/CallDetailsEntryViewHolder.java @@ -34,7 +34,6 @@ import com.android.dialer.calllogutils.CallLogDurations; import com.android.dialer.calllogutils.CallTypeHelper; import com.android.dialer.calllogutils.CallTypeIconsView; import com.android.dialer.common.LogUtil; -import com.android.dialer.compat.AppCompatConstants; import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult; import com.android.dialer.enrichedcall.historyquery.proto.HistoryResult.Type; import com.android.dialer.glidephotomanager.PhotoInfo; @@ -217,20 +216,20 @@ public class CallDetailsEntryViewHolder extends ViewHolder { private static @ColorInt int getColorForCallType(Context context, int callType) { switch (callType) { - case AppCompatConstants.CALLS_OUTGOING_TYPE: - case AppCompatConstants.CALLS_VOICEMAIL_TYPE: - case AppCompatConstants.CALLS_BLOCKED_TYPE: - case AppCompatConstants.CALLS_INCOMING_TYPE: - case AppCompatConstants.CALLS_ANSWERED_EXTERNALLY_TYPE: - case AppCompatConstants.CALLS_REJECTED_TYPE: + case Calls.OUTGOING_TYPE: + case Calls.VOICEMAIL_TYPE: + case Calls.BLOCKED_TYPE: + case Calls.INCOMING_TYPE: + case Calls.ANSWERED_EXTERNALLY_TYPE: + case Calls.REJECTED_TYPE: return ContextCompat.getColor(context, R.color.dialer_secondary_text_color); - case AppCompatConstants.CALLS_MISSED_TYPE: + case Calls.MISSED_TYPE: default: // It is possible for users to end up with calls with unknown call types in their // call history, possibly due to 3rd party call log implementations (e.g. to // distinguish between rejected and missed calls). Instead of crashing, just // assume that all unknown call types are missed calls. - return ContextCompat.getColor(context, R.color.missed_call); + return ContextCompat.getColor(context, R.color.dialer_red); } } } diff --git a/java/com/android/dialer/calldetails/ReportDialogFragment.java b/java/com/android/dialer/calldetails/ReportDialogFragment.java index d75fe51e2..e1c0e9d99 100644 --- a/java/com/android/dialer/calldetails/ReportDialogFragment.java +++ b/java/com/android/dialer/calldetails/ReportDialogFragment.java @@ -37,6 +37,7 @@ import com.android.dialer.logging.Logger; import com.android.dialer.phonenumbercache.CachedNumberLookupService; import com.android.dialer.phonenumbercache.CachedNumberLookupService.CachedContactInfo; import com.android.dialer.phonenumbercache.PhoneNumberCache; +import com.android.dialer.theme.base.ThemeComponent; /** Dialog for reporting an inaccurate caller id information. */ public class ReportDialogFragment extends DialogFragment { @@ -92,7 +93,7 @@ public class ReportDialogFragment extends DialogFragment { } private static void onShow(Context context, AlertDialog dialog) { - int buttonTextColor = context.getColor(R.color.dialer_theme_color); + int buttonTextColor = ThemeComponent.get(context).theme().getColorPrimary(); dialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(buttonTextColor); dialog.getButton(AlertDialog.BUTTON_NEGATIVE).setTextColor(buttonTextColor); } diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml b/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml index 40140971e..cb2faa762 100644 --- a/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml +++ b/java/com/android/dialer/calldetails/res/layout/call_details_entry.xml @@ -36,12 +36,11 @@ android:layout_marginStart="@dimen/call_entry_text_left_margin" android:layout_marginEnd="16dp" android:layout_toStartOf="@+id/call_duration" - android:gravity="start" - android:maxLines="100"/> + android:gravity="start"/> <TextView android:id="@+id/call_time" - style="@style/Dialer.TextAppearance.Secondary" + style="@style/Dialer.TextAppearance.Secondary.Ellipsize" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/call_entry_bottom_padding" @@ -50,7 +49,7 @@ <TextView android:id="@+id/call_duration" - style="@style/Dialer.TextAppearance.Primary" + style="@style/Dialer.TextAppearance.Primary.Ellipsize" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/call_entry_padding" @@ -66,7 +65,7 @@ <TextView android:id="@+id/post_call_note" - style="@style/Dialer.TextAppearance.Secondary" + style="@style/Dialer.TextAppearance.Secondary.Ellipsize" android:layout_width="match_parent" android:layout_height="@dimen/ec_container_height" android:layout_below="@+id/ec_container" @@ -77,7 +76,7 @@ android:visibility="gone"/> <TextView android:id="@+id/rtt_transcript" - style="@style/Dialer.TextAppearance.Secondary" + style="@style/Dialer.TextAppearance.Secondary.Ellipsize" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginBottom="@dimen/call_entry_bottom_padding" @@ -95,6 +94,6 @@ android:layout_marginBottom="@dimen/ec_divider_top_bottom_margin" android:layout_marginStart="@dimen/call_entry_text_left_margin" android:layout_below="@id/rtt_transcript" - android:background="#12000000" + android:background="@color/dialer_divider_line_color" android:visibility="gone"/> </RelativeLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml b/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml index dddb45156..002903803 100644 --- a/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml +++ b/java/com/android/dialer/calldetails/res/layout/call_details_footer.xml @@ -24,7 +24,7 @@ android:layout_height="1dp" android:layout_marginTop="@dimen/ec_divider_top_bottom_margin" android:layout_marginBottom="@dimen/ec_divider_top_bottom_margin" - android:background="#12000000"/> + android:background="@color/dialer_divider_line_color"/> <TextView android:id="@+id/call_detail_action_copy" @@ -32,6 +32,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:drawableStart="@drawable/quantum_ic_content_copy_grey600_24" + android:tint="?colorIcon" android:text="@string/call_details_copy_number"/> <TextView @@ -40,6 +41,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:drawableStart="@drawable/quantum_ic_edit_grey600_24" + android:tint="?colorIcon" android:text="@string/call_details_edit_number"/> <TextView @@ -49,6 +51,7 @@ android:layout_height="wrap_content" android:drawableStart="@drawable/quantum_ic_report_grey600_24" android:text="@string/call_details_report_call_id" + android:tint="?colorIcon" android:visibility="gone"/> <TextView @@ -57,6 +60,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:drawableStart="@drawable/quantum_ic_delete_vd_theme_24" - android:tint="@color/dialer_secondary_text_color" + android:tint="?colorIcon" android:text="@string/delete"/> </LinearLayout> diff --git a/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml b/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml index 09d3c2b43..0fd163f55 100644 --- a/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml +++ b/java/com/android/dialer/calldetails/res/layout/caller_id_report_dialog.xml @@ -24,12 +24,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="24dp" - android:textAppearance="?android:attr/textAppearanceMedium"/> + android:textAppearance="@style/Dialer.TextAppearance.Header2"/> <TextView android:id="@+id/number" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="24dp" - android:textAppearance="?android:attr/textAppearanceMedium"/> + android:textAppearance="@style/Dialer.TextAppearance.Header2"/> </LinearLayout>
\ No newline at end of file diff --git a/java/com/android/dialer/calldetails/res/layout/contact_container.xml b/java/com/android/dialer/calldetails/res/layout/contact_container.xml index e0de8dc5f..e918feb69 100644 --- a/java/com/android/dialer/calldetails/res/layout/contact_container.xml +++ b/java/com/android/dialer/calldetails/res/layout/contact_container.xml @@ -53,14 +53,14 @@ <TextView android:id="@+id/phone_number" - style="@style/Dialer.TextAppearance.Secondary" + style="@style/Dialer.TextAppearance.Secondary.Ellipsize" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/photo_text_margin"/> <TextView android:id="@+id/network" - style="@style/Dialer.TextAppearance.Secondary" + style="@style/Dialer.TextAppearance.Secondary.Ellipsize" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginStart="@dimen/photo_text_margin" @@ -78,7 +78,7 @@ android:contentDescription="@string/call" android:scaleType="center" android:src="@drawable/quantum_ic_call_white_24" - android:tint="@color/secondary_text_color"/> + android:tint="?colorIcon"/> <RelativeLayout @@ -97,11 +97,11 @@ android:layout_marginStart="@dimen/ad_icon_margin_start_offset" android:scaleType="fitCenter" android:src="@drawable/quantum_ic_language_vd_theme_24" - android:tint="@color/secondary_text_color"/> + android:tint="?colorIcon"/> <TextView android:id="@+id/assisted_dialing_text" - style="@style/Dialer.TextAppearance.Secondary" + style="@style/Dialer.TextAppearance.Secondary.Ellipsize" android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginStart="@dimen/ad_text_margin_start" diff --git a/java/com/android/dialer/calldetails/res/layout/ec_data_container.xml b/java/com/android/dialer/calldetails/res/layout/ec_data_container.xml index 523191207..18a7c283c 100644 --- a/java/com/android/dialer/calldetails/res/layout/ec_data_container.xml +++ b/java/com/android/dialer/calldetails/res/layout/ec_data_container.xml @@ -29,7 +29,7 @@ android:layout_centerVertical="true" android:layout_marginStart="1dp" android:maxLines="2" - style="@style/Dialer.TextAppearance.Secondary"/> + style="@style/Dialer.TextAppearance.Secondary.Ellipsize"/> <FrameLayout android:id="@+id/multimedia_image_container" @@ -54,10 +54,9 @@ android:id="@+id/multimedia_attachments_number" android:layout_width="match_parent" android:layout_height="match_parent" - android:textColor="?android:attr/colorBackground" + android:textColor="?android:attr/textColorPrimaryInverse" android:textSize="20sp" - android:fontFamily="sans-serif-medium" - android:background="#80000000" + style="@style/Dialer.TextAppearance.Header2" android:gravity="center" android:visibility="gone"/> </FrameLayout> diff --git a/java/com/android/dialer/calldetails/res/values/styles.xml b/java/com/android/dialer/calldetails/res/values/styles.xml index 1b4329a23..4b861f55b 100644 --- a/java/com/android/dialer/calldetails/res/values/styles.xml +++ b/java/com/android/dialer/calldetails/res/values/styles.xml @@ -15,7 +15,7 @@ ~ limitations under the License --> <resources> - <style name="CallDetailsActionItemStyle"> + <style name="CallDetailsActionItemStyle" parent="Dialer.TextAppearance.Secondary.Ellipsize"> <item name="android:foreground">?android:attr/selectableItemBackground</item> <item name="android:clickable">true</item> <item name="android:drawablePadding">28dp</item> @@ -24,8 +24,6 @@ <item name="android:paddingEnd">28dp</item> <item name="android:paddingTop">16dp</item> <item name="android:paddingBottom">16dp</item> - <item name="android:textColor">#8A000000</item> - <item name="android:textSize">14sp</item> </style> <style name="RttTranscriptLink"> @@ -34,6 +32,7 @@ <item name="android:textAllCaps">true</item> <item name="textAllCaps">true</item> </style> + <style name="RttTranscriptMessage" parent="Dialer.TextAppearance.Secondary"> <item name="android:fontFamily">sans-serif</item> <item name="android:textAllCaps">false</item> |