diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/call_log_activity.xml (renamed from res/layout/call_log_activity_new.xml) | 0 | ||||
| -rw-r--r-- | res/layout/call_log_fragment.xml | 1 | ||||
| -rw-r--r-- | res/layout/call_log_list_item.xml | 21 | ||||
| -rw-r--r-- | res/layout/new_call_log_fragment.xml | 80 | ||||
| -rw-r--r-- | res/layout/new_call_log_list_item.xml | 150 |
5 files changed, 2 insertions, 250 deletions
diff --git a/res/layout/call_log_activity_new.xml b/res/layout/call_log_activity.xml index f9806e802..f9806e802 100644 --- a/res/layout/call_log_activity_new.xml +++ b/res/layout/call_log_activity.xml diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml index 041ca7bb4..e58e160a5 100644 --- a/res/layout/call_log_fragment.xml +++ b/res/layout/call_log_fragment.xml @@ -16,7 +16,6 @@ <!-- Layout parameters are set programmatically. --> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/FragmentActionBarPadding" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml index 54f4fff63..5a6c446a2 100644 --- a/res/layout/call_log_list_item.xml +++ b/res/layout/call_log_list_item.xml @@ -20,6 +20,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" + android:background="@drawable/bottom_border_background" > <!-- This layout may represent either a call log item or one of the @@ -52,11 +53,10 @@ android:layout_height="@dimen/call_log_list_contact_photo_size" android:nextFocusRight="@id/primary_action_view" android:layout_alignParentStart="true" - android:layout_centerVertical="true" android:focusable="true" /> <LinearLayout - android:layout_width="wrap_content" + android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" android:paddingTop="@dimen/call_log_inner_margin" @@ -80,16 +80,6 @@ android:orientation="horizontal" > <TextView - android:id="@+id/number" - 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="14sp" - android:singleLine="true" - android:ellipsize="marquee" - /> - <TextView android:id="@+id/label" android:layout_width="wrap_content" android:layout_height="wrap_content" @@ -127,13 +117,6 @@ /> </LinearLayout> </LinearLayout> - <View - android:id="@+id/divider" - android:layout_width="1px" - android:layout_height="@dimen/call_log_call_action_size" - android:background="@drawable/ic_divider_dashed_holo_dark" - android:layout_gravity="center_vertical" - /> <ImageButton android:id="@+id/secondary_action_icon" android:layout_width="@dimen/call_log_call_action_width" diff --git a/res/layout/new_call_log_fragment.xml b/res/layout/new_call_log_fragment.xml deleted file mode 100644 index e58e160a5..000000000 --- a/res/layout/new_call_log_fragment.xml +++ /dev/null @@ -1,80 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 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. ---> - -<!-- Layout parameters are set programmatically. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" - android:divider="?android:attr/dividerHorizontal" - android:showDividers="end"> - - <FrameLayout - android:id="@+id/voicemail_status" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone"> - <include layout="@layout/call_log_voicemail_status" - /> - </FrameLayout> - - <FrameLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - <TextView - android:id="@+id/filter_status" - android:layout_width="match_parent" - android:layout_height="wrap_content" - style="@style/ContactListSeparatorTextViewStyle" - android:layout_marginStart="@dimen/call_log_outer_margin" - android:layout_marginEnd="@dimen/call_log_outer_margin" - android:paddingTop="@dimen/call_log_inner_margin" - android:paddingBottom="@dimen/call_log_inner_margin" - android:layout_alignParentStart="true" - android:layout_alignParentBottom="true" - android:visibility="gone" - /> - <View - android:id="@+id/call_log_divider" - android:layout_width="match_parent" - android:layout_height="1px" - android:layout_marginStart="@dimen/call_log_outer_margin" - android:layout_marginEnd="@dimen/call_log_outer_margin" - android:layout_gravity="bottom" - android:background="#55ffffff" - /> - </FrameLayout> - <FrameLayout - android:layout_width="match_parent" - android:layout_height="match_parent"> - <ListView android:id="@android:id/list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:fadingEdge="none" - android:scrollbarStyle="outsideOverlay" - android:divider="@null" - /> - <TextView android:id="@android:id/empty" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:text="@string/recentCalls_empty" - android:gravity="center" - android:layout_marginTop="@dimen/empty_message_top_margin" - android:textColor="?android:attr/textColorSecondary" - android:textAppearance="?android:attr/textAppearanceLarge" - /> - </FrameLayout> -</LinearLayout> diff --git a/res/layout/new_call_log_list_item.xml b/res/layout/new_call_log_list_item.xml deleted file mode 100644 index 5a6c446a2..000000000 --- a/res/layout/new_call_log_list_item.xml +++ /dev/null @@ -1,150 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2007 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. ---> - -<view - xmlns:android="http://schemas.android.com/apk/res/android" - class="com.android.dialer.calllog.CallLogListItemView" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:background="@drawable/bottom_border_background" -> - <!-- - This layout may represent either a call log item or one of the - headers in the call log. - - The former will make the @id/call_log_item visible and the - @id/call_log_header gone. - - The latter will make the @id/call_log_header visible and the - @id/call_log_item gone - --> - - <LinearLayout - android:id="@+id/primary_action_view" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_marginStart="@dimen/call_log_outer_margin" - android:layout_marginEnd="@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:nextFocusLeft="@+id/quick_contact_photo" - > - <QuickContactBadge - android:id="@+id/quick_contact_photo" - android:layout_width="@dimen/call_log_list_contact_photo_size" - android:layout_height="@dimen/call_log_list_contact_photo_size" - android:nextFocusRight="@id/primary_action_view" - android:layout_alignParentStart="true" - android:focusable="true" - /> - <LinearLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:paddingTop="@dimen/call_log_inner_margin" - android:paddingBottom="@dimen/call_log_inner_margin" - android:orientation="vertical" - android:gravity="center_vertical" - android:layout_marginStart="@dimen/call_log_inner_margin" - > - <TextView - android:id="@+id/name" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/call_log_icon_margin" - android:textColor="?attr/call_log_primary_text_color" - android:textSize="18sp" - android:singleLine="true" - /> - <LinearLayout - 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:textStyle="bold" - android:textSize="14sp" - android:singleLine="true" - android:ellipsize="marquee" - /> - </LinearLayout> - <LinearLayout - android:id="@+id/call_type" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal" - > - <view - class="com.android.dialer.calllog.CallTypeIconsView" - android:id="@+id/call_type_icons" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginEnd="@dimen/call_log_icon_margin" - android:layout_gravity="center_vertical" - /> - <TextView - android:id="@+id/call_count_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="14sp" - android:singleLine="true" - /> - </LinearLayout> - </LinearLayout> - <ImageButton - android:id="@+id/secondary_action_icon" - android:layout_width="@dimen/call_log_call_action_width" - android:layout_height="match_parent" - android:paddingStart="@dimen/call_log_inner_margin" - android:paddingTop="@dimen/call_log_inner_margin" - android:paddingBottom="@dimen/call_log_inner_margin" - android:paddingEnd="@dimen/call_log_inner_margin" - android:scaleType="center" - android:background="?android:attr/selectableItemBackground" - android:nextFocusLeft="@id/primary_action_view" - /> - </LinearLayout> - - <TextView - android:id="@+id/call_log_header" - style="@style/ContactListSeparatorTextViewStyle" - android:layout_marginStart="@dimen/call_log_outer_margin" - android:layout_marginEnd="@dimen/call_log_outer_margin" - android:paddingTop="@dimen/call_log_inner_margin" - android:paddingBottom="@dimen/call_log_inner_margin" /> - - <View - android:id="@+id/call_log_divider" - android:layout_width="match_parent" - android:layout_height="1px" - android:layout_marginStart="@dimen/call_log_outer_margin" - android:layout_marginEnd="@dimen/call_log_outer_margin" - android:background="#55ffffff" - /> -</view> |