diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/call_log_fragment.xml | 3 | ||||
| -rw-r--r-- | res/layout/call_log_list_item.xml | 71 | ||||
| -rw-r--r-- | res/layout/call_log_list_item_actions.xml | 74 | ||||
| -rw-r--r-- | res/values/colors.xml | 12 | ||||
| -rw-r--r-- | res/values/dimens.xml | 16 | ||||
| -rw-r--r-- | res/values/strings.xml | 110 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
7 files changed, 177 insertions, 113 deletions
diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml index aa8a185a8..23c7b143c 100644 --- a/res/layout/call_log_fragment.xml +++ b/res/layout/call_log_fragment.xml @@ -66,8 +66,7 @@ android:layout_height="match_parent" android:fadingEdge="none" android:scrollbarStyle="outsideOverlay" - android:divider="@color/favorite_contacts_separator_color" - android:dividerHeight="1dp" + android:divider="@null" /> <TextView android:id="@android:id/empty" android:layout_width="match_parent" diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml index 953efc403..eaf2a80b7 100644 --- a/res/layout/call_log_list_item.xml +++ b/res/layout/call_log_list_item.xml @@ -39,22 +39,22 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:baselineAligned="false" - android:orientation="horizontal" + android:orientation="vertical" android:gravity="center_vertical" > <!-- Primary area containing the contact badge and caller information --> <LinearLayout android:id="@+id/primary_action_view" - android:layout_width="0dp" - android:layout_weight="1" + android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_centerVertical="true" android:padding="@dimen/call_log_outer_margin" android:orientation="horizontal" android:gravity="center_vertical" android:background="?android:attr/selectableItemBackground" android:focusable="true" - android:nextFocusRight="@+id/secondary_action_icon" + android:nextFocusRight="@+id/call_back_action" android:nextFocusLeft="@+id/quick_contact_photo" > <QuickContactBadge @@ -79,25 +79,19 @@ android:layout_height="wrap_content" android:layout_marginEnd="@dimen/call_log_icon_margin" android:textColor="?attr/call_log_primary_text_color" - android:textSize="16sp" + android:textSize="@dimen/call_log_primary_text_size" android:singleLine="true" /> - <LinearLayout + <TextView + android:id="@+id/voicemail_transcription" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" - > - <TextView - android:id="@+id/label" - 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="12sp" - android:singleLine="true" - android:ellipsize="marquee" - /> - </LinearLayout> + 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" + /> <LinearLayout android:id="@+id/call_type" android:layout_width="wrap_content" @@ -113,46 +107,25 @@ android:layout_gravity="center_vertical" /> <TextView - android:id="@+id/call_count_and_date" + android:id="@+id/call_location_and_date" android:layout_width="wrap_content" 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="12sp" + android:textSize="@dimen/call_log_secondary_text_size" android:singleLine="true" /> </LinearLayout> </LinearLayout> </LinearLayout> - <!-- Linear layout to house a vertical separator line and the secondary action button. - Used as a convenience to hide both the separator and action button at the same - time. --> - <LinearLayout - android:id="@+id/secondary_action_view" - android:layout_width="@dimen/call_log_call_action_width" - android:layout_height="match_parent" - android:orientation="horizontal" - android:gravity="center_vertical" - > - <!-- Thin vertical divider to visually separate the secondary action button --> - <View - android:id="@+id/vertical_divider" - android:layout_width="@dimen/call_log_list_item_vertical_divider_width" - android:layout_height="match_parent" - android:layout_marginTop="@dimen/call_log_list_item_vertical_divider_margin" - android:layout_marginBottom="@dimen/call_log_list_item_vertical_divider_margin" - android:background="?android:attr/dividerVertical"/> - <!-- The secondary action button; either play voicemail or call details. --> - <ImageButton - android:id="@+id/secondary_action_icon" - android:layout_width="fill_parent" - android:layout_height="match_parent" - android:scaleType="center" - android:background="?android:attr/selectableItemBackground" - android:nextFocusLeft="@id/primary_action_view" - /> - </LinearLayout> + + <!-- Viewstub with additional expandable actions for a call log entry --> + <ViewStub android:id="@+id/call_log_entry_actions_stub" + android:inflatedId="@+id/call_log_entry_actions" + android:layout="@layout/call_log_list_item_actions" + android:layout_width="match_parent" + android:layout_height="wrap_content"/> </LinearLayout> <TextView android:id="@+id/call_log_header" diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml new file mode 100644 index 000000000..733786322 --- /dev/null +++ b/res/layout/call_log_list_item_actions.xml @@ -0,0 +1,74 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2014 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:id="@+id/call_log_action_container"> + <LinearLayout + android:id="@+id/call_log_entry_actions_ll" + android:gravity="center_vertical" + android:layout_width="match_parent" + android:layout_height="@dimen/call_log_action_height" + android:orientation="horizontal" + android:paddingLeft="@dimen/call_log_actions_left_padding" + android:visibility="visible" + android:importantForAccessibility="1" + > + <TextView + android:id="@+id/call_back_action" + android:fontFamily="sans-serif-medium" + android:gravity="center" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:paddingLeft="@dimen/call_log_action_horizontal_padding" + android:paddingRight="@dimen/call_log_action_horizontal_padding" + android:text="@string/call_log_action_call_back" + android:textColor="@color/call_log_action_text" + android:textSize="@dimen/call_log_secondary_text_size" + android:nextFocusLeft="@+id/primary_action_view" + android:nextFocusRight="@+id/voicemail_action" + android:focusable="true"/> + <TextView + android:id="@+id/voicemail_action" + android:fontFamily="sans-serif-medium" + android:gravity="center" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:paddingLeft="@dimen/call_log_action_horizontal_padding" + android:paddingRight="@dimen/call_log_action_horizontal_padding" + android:text="@string/call_log_action_voicemail" + android:textColor="@color/call_log_action_text" + android:textSize="@dimen/call_log_secondary_text_size" + android:nextFocusLeft="@+id/call_back_action" + android:nextFocusRight="@+id/delete_action" + android:focusable="true"/> + <TextView + android:id="@+id/delete_action" + android:fontFamily="sans-serif-medium" + android:gravity="center" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:paddingLeft="@dimen/call_log_action_horizontal_padding" + android:paddingRight="@dimen/call_log_action_horizontal_padding" + android:text="@string/call_log_action_delete" + android:textColor="@color/call_log_action_delete_text" + android:textSize="@dimen/call_log_secondary_text_size" + android:nextFocusLeft="@+id/voicemail_action" + android:nextFocusRight="@+id/primary_action_view" + android:focusable="true"/> + </LinearLayout> +</FrameLayout> diff --git a/res/values/colors.xml b/res/values/colors.xml index 5a6227332..ffc6115bb 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -55,7 +55,7 @@ <color name="background_dialer_light">#ffffff</color> <!-- Background color of dialer list items (contacts, call log entries) --> - <color name="background_dialer_list_items">#ffffff</color> + <color name="background_dialer_list_items">#fbfbfb</color> <!-- Background color of action bars. Ensure this stays in sync with packages/Telephony actionbar_background_color. --> @@ -107,4 +107,14 @@ <!-- Color of action bar text. Ensure this stays in sync with packages/Telephony phone_settings_actionbar_text_color--> <color name="actionbar_text_color">#FFFFFF</color> + + <!-- Color of actions in expanded call log entries. This text color represents actions such + as call back, play voicemail, etc. --> + <color name="call_log_action_text">#1dc7db</color> + + <!-- Color of the "delete" action in expanded call log entries. --> + <color name="call_log_action_delete_text">#ff4f4f</color> + + <!-- Color of action text for expanded call log entries which is disabled. --> + <color name="call_log_disabled_text">#b3b3b3</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 5095cddbe..d81c0f612 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -33,7 +33,7 @@ <dimen name="call_log_outer_margin">8dip</dimen> <dimen name="call_log_indent_margin">24dip</dimen> <dimen name="call_log_list_item_height">56dip</dimen> - <dimen name="call_log_list_contact_photo_size">64dip</dimen> + <dimen name="call_log_list_contact_photo_size">40dip</dimen> <dimen name="call_detail_contact_name_margin">24dip</dimen> <dimen name="call_detail_button_spacing">2dip</dimen> <!-- Defines the vertical margin for the vertical separator between @@ -128,7 +128,19 @@ <dimen name="search_box_text_left_margin">8dp</dimen> <!-- Size of the icon (voice search, close search) in the search box. --> <dimen name="search_box_icon_size">37dp</dimen> - <!-- Size of text in tabs. --> <dimen name="tab_text_size">13sp</dimen> + <!-- Padding to the left and right of call log action buttons. --> + <dimen name="call_log_action_horizontal_padding">8dp</dimen> + <!-- Left-padding for the call log action buttons - ensures the buttons align with the text + to the right of the contact badge. Adjust when any of the following change: + call_log_action_horizontal_padding + call_log_list_contact_photo_size --> + <dimen name="call_log_actions_left_padding">48dp</dimen> + <!-- Text size for primary call log text --> + <dimen name="call_log_primary_text_size">16sp</dimen> + <!-- Text size for secondary call log text --> + <dimen name="call_log_secondary_text_size">14sp</dimen> + <!-- Height of the call log actions section for each call log entry --> + <dimen name="call_log_action_height">48dp</dimen> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 2575a0b1a..4815eb8e9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -472,59 +472,6 @@ --> <string name="description_num_calls"><xliff:g id="numberOfCalls">%1$s</xliff:g> calls.</string> - - <!-- Call history description for a missed call from a caller. - - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - --> - <string name="description_return_missed_call">Return missed call from <xliff:g id="nameOrNumber">%1$s</xliff:g> <xliff:g id="typeOrLocation">%2$s</xliff:g> <xliff:g id="timeOfCall">%3$s</xliff:g></string> - - - <!-- Call history description for an answered call for a caller. - - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - --> - <string name="description_return_answered_call">Return answered call from <xliff:g id="nameOrNumber">%1$s</xliff:g> <xliff:g id="typeOrLocation">%2$s</xliff:g> <xliff:g id="timeOfCall">%3$s</xliff:g></string> - - <!-- Call history description for a missed call from an unknown caller. - Drops the "return" part of description_return_missed_call since it is not - possible to actually call an unknown number. - - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - --> - <string name="description_unknown_missed_call">Missed call from <xliff:g id="nameOrNumber">%1$s</xliff:g> <xliff:g id="typeOrLocation">%2$s</xliff:g> <xliff:g id="timeOfCall">%3$s</xliff:g></string> - - - <!-- Call history description for an answered call from an unknown caller. - Drops the "return" part of description_return_answered_call since it is not - possible to actually call an unknown number. - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - --> - <string name="description_unknown_answered_call">Answered call from <xliff:g id="nameOrNumber">%1$s</xliff:g> <xliff:g id="typeOrLocation">%2$s</xliff:g> <xliff:g id="timeOfCall">%3$s</xliff:g></string> - - <!-- String describing an outgoing call entry in the call log. Used to indicate that - a call will be made to the specified caller. Used when there are multiple calls to/from - the caller. - - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - --> - <string name="description_call_last_multiple">Call <xliff:g id="nameOrNumber">%1$s</xliff:g> <xliff:g id="typeOrLocation">%2$s</xliff:g>. Last called <xliff:g id="timeOfCall">%3$s</xliff:g>.</string> - - <!-- String describing an outgoing call entry in the call log. Used to indicate that - a call will be made to the specified caller. Used when there is only a single call - related to/from the caller. - - Note: AccessibilityServices use this attribute to announce what the view represents. - This is especially valuable for views without textual representation like ImageView. - --> - <string name="description_call_last">Call <xliff:g id="nameOrNumber">%1$s</xliff:g> <xliff:g id="typeOrLocation">%2$s</xliff:g>. Called <xliff:g id="timeOfCall">%3$s</xliff:g>.</string> - - <!-- String describing the button to SMS a number or contact. Note: AccessibilityServices use this attribute to announce what the view represents. @@ -548,10 +495,6 @@ <!-- String describing the icon used to start a voice search --> <string name="description_start_voice_search">Start voice search</string> - <!-- The string used to represent an unknown location for a phone number in the call log - Do not translate. --> - <string name="call_log_empty_geocode"></string> - <!-- Menu item used to call a contact, containing the number of the contact to call --> <string name="menu_callNumber">Call <xliff:g id="number">%s</xliff:g></string> @@ -774,4 +717,57 @@ <!-- The font-family to use for tab text. Do not translate. --> <string name="tab_font_family">sans-serif</string> + + <!-- Button text for the "call back" button displayed underneath an entry in the call log. + Tapping causes a call to be placed to the caller represented by the call log entry. + [CHAR LIMIT=30] --> + <string name="call_log_action_call_back">CALL BACK</string> + + <!-- Button text for the "DELETE" button displayed underneath an entry in the call log. + Tapping causes the call log entry in question to be removed from the call log. + [CHAR LIMIT=30] --> + <string name="call_log_action_delete">DELETE</string> + + <!-- Button text for the "LISTEN" button displayed underneath an entry in the call log. + Tapping navigates the user to the call details screen where the user can listen to the + voicemail represented by the call log entry. + [CHAR LIMIT=30] --> + <string name="call_log_action_voicemail">LISTEN</string> + + <!-- String describing an incoming missed call entry in the call log. + Note: AccessibilityServices uses this attribute to announce what the view represents. + [CHAR LIMIT=NONE] --> + <string name="description_incoming_missed_call">Missed call from <xliff:g id="nameOrNumber" example="John Smith">%1$s</xliff:g>, <xliff:g id="typeOrLocation" example="Mobile">%2$s</xliff:g>, <xliff:g id="timeOfCall" example="2 min ago">%3$s</xliff:g>.</string> + + <!-- String describing an incoming answered call entry in the call log. + Note: AccessibilityServices uses this attribute to announce what the view represents. + [CHAR LIMIT=NONE] --> + <string name="description_incoming_answered_call">Answered call from <xliff:g id="nameOrNumber" example="John Smith">%1$s</xliff:g>, <xliff:g id="typeOrLocation" example="Mobile">%2$s</xliff:g>, <xliff:g id="timeOfCall" example="2 min ago">%3$s</xliff:g>.</string> + + <!-- String describing an outgoing call entry in the call log. + Note: AccessibilityServices uses this attribute to announce what the view represents. + [CHAR LIMIT=NONE] --> + <string name="description_outgoing_call">Call to <xliff:g id="nameOrNumber" example="John Smith">%1$s</xliff:g>, <xliff:g id="typeOrLocation" example="Mobile">%2$s</xliff:g>, <xliff:g id="timeOfCall" example="2 min ago">%3$s</xliff:g>.</string> + + <!-- String describing the "call back" action for an entry in the call log. The call back + action triggers a return call to the named user. + Note: AccessibilityServices uses this attribute to announce the purpose of the button. + [CHAR LIMIT=NONE] --> + <string name="description_call_back_action">Call back <xliff:g id="nameOrNumber" example="John Smith">%1$s</xliff:g></string> + + <!-- String describing the "listen" action for an entry in the call log. The listen + action is shown for call log entries representing a voicemail message and this button + triggers playing back the voicemail. + Note: AccessibilityServices uses this attribute to announce the purpose of the button. + [CHAR LIMIT=NONE] --> + <string name="description_voicemail_action">Listen to voicemail from <xliff:g id="nameOrNumber" example="John Smith">%1$s</xliff:g></string> + + <!-- String describing the "delete" action for an entry in the call log. The delete + action triggers the removal of the current call log entry from the call log. + Note: AccessibilityServices uses this attribute to announce the purpose of the button. + [CHAR LIMIT=NONE] --> + <string name="description_delete_action">Delete call log entry for <xliff:g id="nameOrNumber" example="John Smith">%1$s</xliff:g></string> + + <!-- Toast message which appears when a call log entry is deleted. --> + <string name="toast_entry_removed">Call log entry deleted.</string> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 738a0b690..db56ab286 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -100,9 +100,9 @@ <item name="android:actionBarStyle">@style/DialtactsActionBarStyle</item> <item name="android:actionOverflowButtonStyle">@style/DialtactsActionBarOverflow</item> <!-- CallLog --> - <item name="call_log_primary_text_color">#333333</item> + <item name="call_log_primary_text_color">#404040</item> <item name="call_log_primary_background_color">#FFFFFF</item> - <item name="call_log_secondary_text_color">#333333</item> + <item name="call_log_secondary_text_color">#9a9a9a</item> <item name="call_log_secondary_background_color">#FFFFFF</item> <item name="call_log_header_color">#FFFFFF</item> <!-- VoicemailStatus --> |