diff options
author | Andrew Lee <anwlee@google.com> | 2015-03-13 17:28:34 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2015-03-16 12:53:11 -0700 |
commit | 14cfa66d6df53303c280194d661c0b32838aa417 (patch) | |
tree | 25aed55d2b815760dfbd5e5e2ca015df8eddf70d /res | |
parent | 616b7f2c33a4294e100cc1851a012cd04ac3500d (diff) |
Delete call log list item extras.
- Remove isCallLog specific code from adapter; now everything will
always be in the call log.
- Remove unneeded adapter bits from ListsFragment; there is now no
shortcut card shown in the lists fragment.
- Remove call log list item extra. We won't bind badges using this
any more. This will be superseded by the actions. Remove
badge-related code in CallLogAdapter.
+ Leaving the add-person icon, since it will be used in the future.
Bug: 19372817
Bug: 19627987
Change-Id: I4db8149761b017e02e89c081930a05f3aafe9606
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/call_log_list_item.xml | 6 | ||||
-rw-r--r-- | res/layout/call_log_list_item_extra.xml | 68 | ||||
-rw-r--r-- | res/values/colors.xml | 1 | ||||
-rw-r--r-- | res/values/dimens.xml | 3 | ||||
-rw-r--r-- | res/values/strings.xml | 3 |
5 files changed, 1 insertions, 80 deletions
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml index db59b74d3..910e78f5e 100644 --- a/res/layout/call_log_list_item.xml +++ b/res/layout/call_log_list_item.xml @@ -155,9 +155,5 @@ android:layout_width="match_parent" android:layout_height="wrap_content"/> </LinearLayout> - <!-- Displays the extra link section --> - <ViewStub android:id="@+id/link_stub" - android:layout="@layout/call_log_list_item_extra" - android:layout_width="match_parent" - android:layout_height="wrap_content"/> + </LinearLayout> diff --git a/res/layout/call_log_list_item_extra.xml b/res/layout/call_log_list_item_extra.xml deleted file mode 100644 index 87b932bc6..000000000 --- a/res/layout/call_log_list_item_extra.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> - -<!-- - ~ Copyright (C) 2013 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 - --> - -<!-- Can't use merge here because this is referenced via a ViewStub --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/badge_container" - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <View android:layout_width="match_parent" - android:layout_height="1px" - android:background="@color/favorite_contacts_separator_color" /> - - <LinearLayout android:id="@+id/badge_link_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="@dimen/call_log_outer_margin" - android:paddingEnd="@dimen/call_log_outer_margin" - android:paddingTop="@dimen/call_log_item_extra_padding_vertical" - android:paddingBottom="@dimen/call_log_item_extra_padding_vertical" - android:background="?android:attr/selectableItemBackground" - android:clickable="true"> - - <ImageView android:id="@+id/badge_image" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:tint="@color/call_log_extras_text_color" - android:padding="@dimen/call_log_outer_margin" /> - - <TextView android:id="@+id/badge_text" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingStart="@dimen/call_log_start_margin" - android:textColor="@color/call_log_extras_text_color" - android:layout_gravity="center_vertical" - android:layout_weight="1" /> - - <ImageView android:id="@+id/dismiss_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="@dimen/icon_padding" - android:layout_gravity="center_vertical" - android:layout_marginEnd="@dimen/call_log_icon_margin" - android:src="@drawable/ic_close_dk" - android:tint="@color/recent_call_log_item_phone_icon_tint" - android:alpha="0.3" - android:background="?android:attr/selectableItemBackground" - android:visibility="gone" - android:contentDescription="@string/description_dismiss" /> - - </LinearLayout> - -</FrameLayout>
\ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index cd3a804f0..f697cc8cc 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -38,7 +38,6 @@ <!-- Tint of the recent card phone icon --> <color name="recent_call_log_item_phone_icon_tint">#000000</color> - <color name="call_log_extras_text_color">#0277bd</color> <!-- Colour of voicemail progress bar to the right of position indicator. diff --git a/res/values/dimens.xml b/res/values/dimens.xml index e4097e3eb..9de20f310 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -64,9 +64,6 @@ <dimen name="favorites_row_end_padding">0dp</dimen> <dimen name="favorites_row_undo_text_side_padding">32dp</dimen> - <dimen name="call_log_item_extra_padding_vertical">4dp</dimen> - - <!-- Size of the star icon on the favorites tile. --> <dimen name="favorites_star_icon_size">12dp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 78b74e656..13bf845c3 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -526,9 +526,6 @@ --> <string name="contact_tooltip">Touch image to see all numbers or touch & hold to reorder</string> - <!-- Content description for dismiss button on badge. [CHAR LIMIT=NONE] --> - <string name="description_dismiss">Dismiss</string> - <!-- Remove button that shows up when contact is long-pressed. [CHAR LIMIT=NONE] --> <string name="remove_contact">Remove</string> |