diff options
Diffstat (limited to 'java/com/android/dialer/app/res/layout')
15 files changed, 44 insertions, 63 deletions
diff --git a/java/com/android/dialer/app/res/layout/blocked_number_footer.xml b/java/com/android/dialer/app/res/layout/blocked_number_footer.xml index 9e05cfbf4..2d368605c 100644 --- a/java/com/android/dialer/app/res/layout/blocked_number_footer.xml +++ b/java/com/android/dialer/app/res/layout/blocked_number_footer.xml @@ -32,7 +32,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:text="@string/block_number_footer_message_vvm" - android:textColor="@color/blocked_number_secondary_text_color" - android:textSize="@dimen/blocked_number_settings_description_text_size"/> + style="@style/Dialer.TextAppearance.Secondary"/> </LinearLayout> </LinearLayout> diff --git a/java/com/android/dialer/app/res/layout/blocked_number_fragment.xml b/java/com/android/dialer/app/res/layout/blocked_number_fragment.xml index 745b913cc..22dcfefa5 100644 --- a/java/com/android/dialer/app/res/layout/blocked_number_fragment.xml +++ b/java/com/android/dialer/app/res/layout/blocked_number_fragment.xml @@ -17,7 +17,7 @@ android:id="@+id/blocked_number_fragment" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/blocked_number_background" + android:background="?android:attr/colorBackground" android:orientation="vertical"> <ListView diff --git a/java/com/android/dialer/app/res/layout/blocked_number_header.xml b/java/com/android/dialer/app/res/layout/blocked_number_header.xml index e1019d1eb..27b624ccd 100644 --- a/java/com/android/dialer/app/res/layout/blocked_number_header.xml +++ b/java/com/android/dialer/app/res/layout/blocked_number_header.xml @@ -29,7 +29,7 @@ android:paddingBottom="29dp" android:paddingStart="@dimen/blocked_number_container_padding" android:paddingEnd="44dp" - android:background="@color/blocked_number_disabled_emergency_background_color" + android:background="?android:attr/colorBackground" android:focusable="true" android:orientation="vertical" android:visibility="gone"> @@ -69,7 +69,7 @@ android:paddingStart="@dimen/blocked_number_container_padding" android:gravity="center_vertical" android:text="@string/block_list" - android:textColor="@color/blocked_number_header_color"/> + android:textColor="?android:attr/textColorPrimary"/> <RelativeLayout android:id="@+id/import_settings" @@ -88,7 +88,7 @@ android:paddingStart="@dimen/blocked_number_container_padding" android:paddingEnd="@dimen/blocked_number_container_padding" android:text="@string/blocked_call_settings_import_description" - android:textColor="@color/secondary_text_color" + android:textColor="?colorIcon" android:textSize="@dimen/blocked_number_settings_description_text_size"/> <Button @@ -116,7 +116,7 @@ android:layout_height="1dp" android:layout_marginTop="8dp" android:layout_below="@id/import_button" - android:background="@color/divider_line_color"/> + android:background="@color/dialer_divider_line_color"/> </RelativeLayout> @@ -138,7 +138,7 @@ android:paddingEnd="@dimen/blocked_number_container_padding" android:gravity="center_vertical" android:text="@string/migrate_blocked_numbers_dialog_title" - android:textColor="@color/blocked_number_header_color"/> + android:textColor="?android:attr/textColorPrimary"/> <TextView android:id="@+id/migrate_promo_description" @@ -148,7 +148,7 @@ android:layout_marginStart="@dimen/blocked_number_container_padding" android:layout_marginEnd="@dimen/blocked_number_container_padding" android:text="@string/migrate_blocked_numbers_dialog_message" - android:textColor="@color/secondary_text_color"/> + android:textColor="?colorIcon"/> <Button android:id="@+id/migrate_promo_allow_button" @@ -171,7 +171,7 @@ android:layout_width="match_parent" android:layout_height="1dp" android:layout_marginStart="72dp" - android:background="@color/divider_line_color"/> + android:background="@color/dialer_divider_line_color"/> </LinearLayout> diff --git a/java/com/android/dialer/app/res/layout/blocked_number_item.xml b/java/com/android/dialer/app/res/layout/blocked_number_item.xml index 92ebdc35d..921c476ec 100644 --- a/java/com/android/dialer/app/res/layout/blocked_number_item.xml +++ b/java/com/android/dialer/app/res/layout/blocked_number_item.xml @@ -45,17 +45,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:includeFontPadding="false" - android:singleLine="true" - android:textColor="@color/blocked_number_primary_text_color" - android:textSize="@dimen/blocked_number_primary_text_size"/> + style="@style/Dialer.TextAppearance.Primary.Ellipsize"/> <TextView android:id="@+id/caller_number" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" - android:textColor="@color/blocked_number_secondary_text_color" - android:textSize="@dimen/blocked_number_settings_description_text_size"/> + style="@style/Dialer.TextAppearance.Secondary.Ellipsize"/> </LinearLayout> <ImageView @@ -67,6 +63,5 @@ android:contentDescription="@string/description_blocked_number_list_delete" android:scaleType="center" android:src="@drawable/ic_remove" - android:tint="@color/blocked_number_icon_tint"/> - + android:tint="?colorIcon"/> </LinearLayout> diff --git a/java/com/android/dialer/app/res/layout/call_log_activity.xml b/java/com/android/dialer/app/res/layout/call_log_activity.xml index d9d40a1a0..4b3c1e0f6 100644 --- a/java/com/android/dialer/app/res/layout/call_log_activity.xml +++ b/java/com/android/dialer/app/res/layout/call_log_activity.xml @@ -18,7 +18,7 @@ android:id="@+id/calllog_frame" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?android:attr/colorBackgroundFloating" + android:background="?android:attr/colorBackground" android:orientation="vertical"> <com.android.contacts.common.list.ViewPagerTabs android:id="@+id/viewpager_header" diff --git a/java/com/android/dialer/app/res/layout/call_log_fragment.xml b/java/com/android/dialer/app/res/layout/call_log_fragment.xml index 2fb63606a..bf91a3a07 100644 --- a/java/com/android/dialer/app/res/layout/call_log_fragment.xml +++ b/java/com/android/dialer/app/res/layout/call_log_fragment.xml @@ -47,8 +47,7 @@ android:gravity="center_vertical" android:text="@string/select_all" android:textAllCaps="true" - android:textStyle="bold" - android:textColor="@color/remove_text_color" + android:textColor="?android:attr/textColorPrimaryInverse" android:textSize="@dimen/select_all_text_size"/> </LinearLayout> diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item.xml b/java/com/android/dialer/app/res/layout/call_log_list_item.xml index 23aeda3da..fd73e0bb4 100644 --- a/java/com/android/dialer/app/res/layout/call_log_list_item.xml +++ b/java/com/android/dialer/app/res/layout/call_log_list_item.xml @@ -29,11 +29,9 @@ android:layout_gravity="start" android:layout_marginStart="@dimen/call_log_start_margin" android:layout_marginEnd="@dimen/call_log_outer_margin" - android:fontFamily="sans-serif-medium" - android:textColor="@color/call_log_day_group_heading_color" - android:textSize="@dimen/call_log_day_group_heading_size" android:paddingTop="@dimen/call_log_day_group_padding_top" - android:paddingBottom="@dimen/call_log_day_group_padding_bottom"/> + android:paddingBottom="@dimen/call_log_day_group_padding_bottom" + style="@style/Dialer.TextAppearance.OVERLINE.Ellipsize"/> <android.support.v7.widget.CardView android:id="@+id/call_log_row" @@ -99,9 +97,7 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/call_log_name_margin_bottom" android:layout_marginEnd="@dimen/call_log_icon_margin" - android:textColor="@color/call_log_primary_color" - android:textSize="@dimen/call_log_primary_text_size" - android:maxLines="1"/> + style="Dialer.TextAppearance.Primary.Ellipsize"/> <LinearLayout android:id="@+id/call_type" @@ -131,9 +127,7 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/call_log_icon_margin" android:layout_gravity="center_vertical" - android:textColor="@color/call_log_detail_color" - android:textSize="@dimen/call_log_detail_text_size" - android:maxLines="1"/> + style="Dialer.TextAppearance.Secondary.Ellipsize"/> </LinearLayout> @@ -143,10 +137,8 @@ android:layout_height="wrap_content" android:layout_marginTop="@dimen/call_log_call_account_margin_bottom" android:layout_marginEnd="@dimen/call_log_icon_margin" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/call_log_detail_text_size" android:visibility="gone" - android:maxLines="1"/> + style="Dialer.TextAppearance.Secondary2.Ellipsize"/> <LinearLayout android:id="@+id/transcription" @@ -160,22 +152,20 @@ android:id="@+id/voicemail_transcription" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/call_log_voicemail_transcript_color" - android:textSize="@dimen/call_log_voicemail_transcription_text_size" android:focusable="true" android:nextFocusDown="@+id/voicemail_transcription_branding" - android:textIsSelectable="true"/> + android:textIsSelectable="true" + style="Dialer.TextAppearance.Secondary2"/> <TextView android:id="@+id/voicemail_transcription_branding" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/call_log_voicemail_transcript_branding_color" - android:textSize="@dimen/call_log_voicemail_transcription_text_size" android:focusable="true" android:nextFocusUp="@id/voicemail_transcription" android:nextFocusDown="@+id/voicemail_transcription_rating" - android:paddingTop="2dp"/> + android:paddingTop="2dp" + style="Dialer.TextAppearance.Secondary2"/> <LinearLayout android:id="@+id/voicemail_transcription_rating" @@ -230,7 +220,7 @@ android:layout_gravity="center_vertical" android:background="?android:attr/selectableItemBackgroundBorderless" android:scaleType="center" - android:tint="@color/call_log_list_item_primary_action_icon_tint" + android:tint="?colorIcon" android:visibility="gone"/> </LinearLayout> diff --git a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml index 56d1daf6a..7f2459486 100644 --- a/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml +++ b/java/com/android/dialer/app/res/layout/call_log_list_item_actions.xml @@ -31,7 +31,7 @@ <View android:layout_width="match_parent" android:layout_height="1dp" - android:background="@color/call_log_action_divider"/> + android:background="@color/dialer_divider_line_color"/> <LinearLayout android:id="@+id/call_action" diff --git a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml index cf6591b63..f8e3000d4 100644 --- a/java/com/android/dialer/app/res/layout/dialtacts_activity.xml +++ b/java/com/android/dialer/app/res/layout/dialtacts_activity.xml @@ -19,7 +19,7 @@ android:id="@+id/dialtacts_mainlayout" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?android:attr/colorBackgroundFloating" + android:background="?android:attr/colorBackground" android:clipChildren="false" android:clipToPadding="false" android:focusable="true" @@ -48,7 +48,7 @@ android:contentDescription="@string/action_menu_dialpad_button" android:src="@drawable/quantum_ic_dialpad_white_24" app:elevation="@dimen/floating_action_button_translation_z" - app:backgroundTint="@color/dialer_secondary_color"/> + app:backgroundTint="?android:attr/colorAccent"/> <!-- Host container for the contact tile drag shadow --> <FrameLayout diff --git a/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml b/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml index 1d2047982..437fa7d18 100644 --- a/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml +++ b/java/com/android/dialer/app/res/layout/empty_content_view_dialpad_search.xml @@ -28,12 +28,11 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center_horizontal|top" - android:textSize="@dimen/empty_list_message_text_size" - android:textColor="@color/empty_list_text_color" android:paddingRight="16dp" android:paddingLeft="16dp" android:paddingTop="8dp" - android:paddingBottom="8dp"/> + android:paddingBottom="8dp" + style="Dialer.TextAppearance.Primary.Ellipsize"/> <TextView android:id="@+id/empty_list_view_action" diff --git a/java/com/android/dialer/app/res/layout/lists_fragment.xml b/java/com/android/dialer/app/res/layout/lists_fragment.xml index 1126b0e51..6be1fe08f 100644 --- a/java/com/android/dialer/app/res/layout/lists_fragment.xml +++ b/java/com/android/dialer/app/res/layout/lists_fragment.xml @@ -81,15 +81,15 @@ android:layout_marginTop="8dp" android:layout_marginBottom="8dp" android:src="@drawable/ic_remove" - android:tint="@color/remove_text_color"/> + android:tint="?colorTextOnUnthemedDarkBackground"/> <TextView android:id="@+id/remove_view_text" android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/remove_contact" - android:textColor="@color/remove_text_color" - android:textSize="@dimen/remove_text_size"/> + android:textColor="?colorTextOnUnthemedDarkBackground" + style="@style/Dialer.TextAppearance.Primary"/> </LinearLayout> diff --git a/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml b/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml index 3aeba98a7..df7ce5c55 100644 --- a/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml +++ b/java/com/android/dialer/app/res/layout/phone_favorite_tile_view.xml @@ -74,7 +74,7 @@ android:fontFamily="sans-serif-medium" android:singleLine="true" android:textAlignment="viewStart" - android:textColor="@color/contact_tile_name_color" + android:textColor="?colorTextOnUnthemedDarkBackground" android:textSize="15sp"/> <ImageView android:id="@+id/contact_star_icon" @@ -95,7 +95,7 @@ android:gravity="center_vertical" android:singleLine="true" android:textAlignment="viewStart" - android:textColor="@color/contact_tile_name_color" + android:textColor="?colorTextOnUnthemedDarkBackground" android:textSize="11sp"/> </LinearLayout> @@ -103,7 +103,7 @@ android:id="@+id/contact_tile_push_state" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/item_background_material_dark" + android:background="?android:selectableItemBackground" android:importantForAccessibility="no"/> <!-- Wrap the ImageButton in a layout with a transparent background so the ripple has something to draw on --> diff --git a/java/com/android/dialer/app/res/layout/search_edittext.xml b/java/com/android/dialer/app/res/layout/search_edittext.xml index 8a2cfd483..aba5ba8ea 100644 --- a/java/com/android/dialer/app/res/layout/search_edittext.xml +++ b/java/com/android/dialer/app/res/layout/search_edittext.xml @@ -43,7 +43,7 @@ android:importantForAccessibility="no" android:scaleType="center" android:src="@drawable/quantum_ic_search_vd_theme_24" - android:tint="@color/searchbox_icon_tint"/> + android:tint="?colorIcon"/> <TextView android:id="@+id/search_box_start_search" @@ -55,7 +55,6 @@ android:fontFamily="@string/search_font_family" android:gravity="center_vertical" android:hint="@string/dialer_hint_find_contact" - android:textColorHint="@color/searchbox_hint_text_color" android:textSize="@dimen/search_collapsed_text_size"/> <ImageView @@ -68,7 +67,7 @@ android:contentDescription="@string/description_start_voice_search" android:scaleType="center" android:src="@drawable/ic_mic_grey600" - android:tint="@color/searchbox_icon_tint"/> + android:tint="?colorIcon"/> <ImageButton android:id="@+id/dialtacts_options_menu_button" @@ -79,7 +78,7 @@ android:contentDescription="@string/action_menu_overflow_description" android:scaleType="center" android:src="@drawable/quantum_ic_more_vert_white_24" - android:tint="@color/searchbox_icon_tint"/> + android:tint="?colorIcon"/> </RelativeLayout> <include layout="@layout/search_bar_expanded"/> diff --git a/java/com/android/dialer/app/res/layout/view_numbers_to_import_fragment.xml b/java/com/android/dialer/app/res/layout/view_numbers_to_import_fragment.xml index be691748a..e821c0637 100644 --- a/java/com/android/dialer/app/res/layout/view_numbers_to_import_fragment.xml +++ b/java/com/android/dialer/app/res/layout/view_numbers_to_import_fragment.xml @@ -16,7 +16,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/blocked_number_background" + android:background="?android:attr/colorBackground" android:orientation="vertical"> <ListView diff --git a/java/com/android/dialer/app/res/layout/voicemail_playback_layout.xml b/java/com/android/dialer/app/res/layout/voicemail_playback_layout.xml index a9b866e89..c352e02d1 100644 --- a/java/com/android/dialer/app/res/layout/voicemail_playback_layout.xml +++ b/java/com/android/dialer/app/res/layout/voicemail_playback_layout.xml @@ -28,7 +28,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" - android:textSize="14sp"/> + style="@style/Dialer.TextAppearance.Secondary"/> <LinearLayout android:layout_width="match_parent" @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:importantForAccessibility="no" - android:textSize="14sp"/> + style="@style/Dialer.TextAppearance.Secondary"/> <SeekBar android:id="@+id/playback_seek" @@ -60,7 +60,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:importantForAccessibility="no" - android:textSize="14sp"/> + style="@style/Dialer.TextAppearance.Secondary"/> </LinearLayout> @@ -80,7 +80,7 @@ style="@style/VoicemailPlaybackLayoutButtonStyle" android:contentDescription="@string/description_playback_speakerphone" android:src="@drawable/quantum_ic_volume_down_white_24" - android:tint="@color/voicemail_icon_tint"/> + android:tint="?colorIcon"/> <Space android:layout_width="0dp" @@ -103,7 +103,7 @@ style="@style/VoicemailPlaybackLayoutButtonStyle" android:contentDescription="@string/call_log_trash_voicemail" android:src="@drawable/quantum_ic_delete_white_24" - android:tint="@color/voicemail_icon_tint"/> + android:tint="?colorIcon"/> <Space android:layout_width="0dp" |