diff options
author | Brandon Maxwell <maxwelb@google.com> | 2015-10-14 23:14:59 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-10-14 23:14:59 +0000 |
commit | 5b23eaa282f7b4215e47c2fc36e01352becf2130 (patch) | |
tree | bc91496a3f9af6e02fb60a38767bcefaf52a08e7 /res | |
parent | 2931254ef7c0fd0c21914ded2c0b6875c4d3e43c (diff) | |
parent | 8f1be9edcd49f2ee4dbff6fca640628beef18d58 (diff) |
am 8f1be9ed: Merge "Moving call type/location for voicemail" into ub-contactsdialer-a-dev
* commit '8f1be9edcd49f2ee4dbff6fca640628beef18d58':
Moving call type/location for voicemail
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/call_detail_header.xml | 4 | ||||
-rw-r--r-- | res/layout/call_detail_history_item.xml | 4 | ||||
-rw-r--r-- | res/layout/call_log_list_item.xml | 35 | ||||
-rw-r--r-- | res/layout/call_log_list_item_actions.xml | 20 | ||||
-rw-r--r-- | res/layout/voicemail_promo_card.xml | 2 | ||||
-rw-r--r-- | res/values/colors.xml | 14 | ||||
-rw-r--r-- | res/values/dimens.xml | 12 | ||||
-rw-r--r-- | res/values/styles.xml | 13 |
8 files changed, 68 insertions, 36 deletions
diff --git a/res/layout/call_detail_header.xml b/res/layout/call_detail_header.xml index 5931445e4..6eceb80ee 100644 --- a/res/layout/call_detail_header.xml +++ b/res/layout/call_detail_header.xml @@ -59,7 +59,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="?attr/call_log_secondary_text_color" - android:textSize="@dimen/call_log_secondary_text_size" + android:textSize="@dimen/call_log_detail_text_size" android:layout_marginBottom="1dp" android:singleLine="true" /> @@ -68,7 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="?attr/call_log_secondary_text_color" - android:textSize="@dimen/call_log_secondary_text_size" + android:textSize="@dimen/call_log_detail_text_size" android:singleLine="true" android:visibility="gone" /> diff --git a/res/layout/call_detail_history_item.xml b/res/layout/call_detail_history_item.xml index cbe844234..10d9605a1 100644 --- a/res/layout/call_detail_history_item.xml +++ b/res/layout/call_detail_history_item.xml @@ -46,11 +46,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="?attr/call_log_secondary_text_color" - android:textSize="@dimen/call_log_secondary_text_size" /> + android:textSize="@dimen/call_log_detail_text_size" /> <TextView android:id="@+id/duration" android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="?attr/call_log_secondary_text_color" - android:textSize="@dimen/call_log_secondary_text_size" /> + android:textSize="@dimen/call_log_detail_text_size" /> </LinearLayout> diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml index ec512b67f..95de2680c 100644 --- a/res/layout/call_log_list_item.xml +++ b/res/layout/call_log_list_item.xml @@ -30,8 +30,8 @@ android:layout_marginStart="@dimen/call_log_start_margin" android:layout_marginEnd="@dimen/call_log_outer_margin" android:fontFamily="sans-serif-medium" - android:textColor="?attr/call_log_secondary_text_color" - android:textSize="@dimen/call_log_secondary_text_size" + 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" /> @@ -83,21 +83,10 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/call_log_name_margin_bottom" android:layout_marginEnd="@dimen/call_log_icon_margin" - android:textColor="?attr/call_log_primary_text_color" + android:textColor="@color/call_log_primary_color" android:textSize="@dimen/call_log_primary_text_size" android:singleLine="true" /> - <TextView - android:id="@+id/voicemail_transcription" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/call_log_icon_margin" - android:textColor="?attr/call_log_secondary_text_color" - android:textSize="@dimen/call_log_secondary_text_size" - android:singleLine="true" - android:ellipsize="marquee" - android:visibility="gone" /> - <LinearLayout android:id="@+id/call_type" android:layout_width="wrap_content" @@ -118,8 +107,8 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/call_log_icon_margin" android:layout_gravity="center_vertical" - android:textColor="?attr/call_log_secondary_text_color" - android:textSize="@dimen/call_log_secondary_text_size" + android:textColor="@color/call_log_detail_color" + android:textSize="@dimen/call_log_detail_text_size" android:singleLine="true" /> </LinearLayout> @@ -130,10 +119,22 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/call_log_icon_margin" android:textColor="?attr/call_log_secondary_text_color" - android:textSize="@dimen/call_log_secondary_text_size" + android:textSize="@dimen/call_log_detail_text_size" android:visibility="gone" android:singleLine="true" /> + <TextView + android:id="@+id/voicemail_transcription" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/call_log_icon_margin" + android:textColor="@color/call_log_voicemail_transcript_color" + android:textSize="@dimen/call_log_voicemail_transcription_text_size" + android:ellipsize="marquee" + android:visibility="gone" + android:singleLine="false" + android:maxLines="10"/> + </LinearLayout> <ImageView diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml index 16a712bcd..262a17685 100644 --- a/res/layout/call_log_list_item_actions.xml +++ b/res/layout/call_log_list_item_actions.xml @@ -19,6 +19,7 @@ android:gravity="center_vertical" android:layout_width="match_parent" android:layout_height="wrap_content" + android:paddingBottom="@dimen/call_log_actions_bottom_padding" android:orientation="vertical" android:visibility="visible" android:importantForAccessibility="1"> @@ -35,16 +36,27 @@ <LinearLayout android:id="@+id/call_action" + android:paddingTop="@dimen/call_log_actions_top_padding" style="@style/CallLogActionStyle"> <ImageView style="@style/CallLogActionIconStyle" android:src="@drawable/ic_call_24dp" /> - <TextView - android:id="@+id/call_action_text" - style="@style/CallLogActionTextStyle" - android:text="@string/description_call_log_call_action" /> + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="center_vertical"> + <TextView + android:id="@+id/call_action_text" + style="@style/CallLogActionTextStyle" + android:text="@string/description_call_log_call_action" /> + + <TextView + android:id="@+id/call_type_or_location_text" + style="@style/CallLogActionSupportTextStyle"/> + </LinearLayout> </LinearLayout> diff --git a/res/layout/voicemail_promo_card.xml b/res/layout/voicemail_promo_card.xml index 891f09693..ba4ac59a7 100644 --- a/res/layout/voicemail_promo_card.xml +++ b/res/layout/voicemail_promo_card.xml @@ -57,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textColor="@color/background_dialer_white" - android:textSize="@dimen/call_log_secondary_text_size" + android:textSize="@dimen/call_log_detail_text_size" android:text="@string/visual_voicemail_text" android:lineSpacingExtra="@dimen/promo_card_line_spacing" android:singleLine="false"/> diff --git a/res/values/colors.xml b/res/values/colors.xml index d0f7ed000..8b7b1502f 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -33,8 +33,20 @@ <color name="setting_background_color">#ffffff</color> <color name="setting_button_color">#eee</color> + <!-- 54% black --> + <color name="call_log_icon_tint">#8a000000</color> + <!-- 87% black --> + <color name="call_log_primary_color">#de000000</color> + <!-- 54% black --> + <color name="call_log_detail_color">#8a000000</color> + <!-- 87% black --> + <color name="call_log_voicemail_transcript_color">#de000000</color> <!-- 70% black --> - <color name="call_log_icon_tint">#b3000000</color> + <color name="call_log_action_color">#b3000000</color> + <!-- 54% black --> + <color name="call_log_day_group_heading_color">#8a000000</color> + <!-- 87% black--> + <color name="call_log_unread_text_color">#de000000</color> <color name="call_log_list_item_primary_action_icon_tint">@color/call_log_icon_tint</color> <!-- Color of the text describing an unconsumed missed call. --> <color name="call_log_missed_call_highlight_color">@color/dialer_red_highlight_color</color> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d3c52a313..18f33d5f2 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -108,17 +108,19 @@ <dimen name="search_list_padding_top">16dp</dimen> <dimen name="search_box_elevation">3dp</dimen> - <dimen name="call_log_action_height">48dp</dimen> <dimen name="call_log_action_icon_margin_start">16dp</dimen> <dimen name="call_log_action_icon_dimen">24dp</dimen> <dimen name="call_log_action_horizontal_padding">24dp</dimen> <dimen name="call_log_actions_left_padding">64dp</dimen> - <dimen name="call_log_primary_text_size">14sp</dimen> - <dimen name="call_log_secondary_text_size">14sp</dimen> - <dimen name="call_log_list_item_actions_text_size">12sp</dimen> + <dimen name="call_log_actions_top_padding">8dp</dimen> + <dimen name="call_log_actions_bottom_padding">8dp</dimen> + <dimen name="call_log_primary_text_size">16sp</dimen> + <dimen name="call_log_detail_text_size">12sp</dimen> + <dimen name="call_log_day_group_heading_size">14sp</dimen> + <dimen name="call_log_voicemail_transcription_text_size">14sp</dimen> <!-- Height of the call log actions section for each call log entry --> - <dimen name="call_log_action_height">44dp</dimen> + <dimen name="call_log_action_height">48dp</dimen> <dimen name="call_log_day_group_padding_top">15dp</dimen> <dimen name="call_log_day_group_padding_bottom">9dp</dimen> diff --git a/res/values/styles.xml b/res/values/styles.xml index 3d8644281..7828a20f1 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -222,14 +222,19 @@ <item name="android:layout_height">wrap_content</item> <item name="android:paddingStart">@dimen/call_log_action_horizontal_padding</item> <item name="android:paddingEnd">@dimen/call_log_action_horizontal_padding</item> - <item name="android:textColor">?attr/call_log_secondary_text_color</item> - <item name="android:textSize">@dimen/call_log_list_item_actions_text_size</item> - <item name="android:fontFamily">"sans-serif-medium"</item> + <item name="android:textColor">@color/call_log_action_color</item> + <item name="android:textSize">@dimen/call_log_primary_text_size</item> + <item name="android:fontFamily">"sans-serif"</item> <item name="android:focusable">true</item> <item name="android:singleLine">true</item> <item name="android:importantForAccessibility">no</item> </style> + <style name="CallLogActionSupportTextStyle" parent="@style/CallLogActionTextStyle"> + <item name="android:textSize">@dimen/call_log_detail_text_size</item> + <item name="android:textColor">@color/call_log_detail_color</item> + </style> + <style name="CallLogActionIconStyle"> <item name="android:layout_width">@dimen/call_log_action_icon_dimen</item> <item name="android:layout_height">@dimen/call_log_action_icon_dimen</item> @@ -299,7 +304,7 @@ <style name="PromoCardActionStyle" parent="TextActionStyle"> <item name="android:textColor">@color/promo_card_text</item> - <item name="android:textSize">@dimen/call_log_list_item_actions_text_size</item> + <item name="android:textSize">@dimen/call_log_primary_text_size</item> </style> <style name="VoicemailPlaybackLayoutTextStyle"> |