Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4a8e2cc9 authored by Flavio Lerda's avatar Flavio Lerda
Browse files

Remove one more layer of view hierarchy. 

Now that we no longer use the phone call details layout in the call
details, we can include it directly in the call log list item and
removed the relative layout that was wrapping it, further reducing the
number of views and the view hierarchy.

Bug: 5099652
Change-Id: Idbc3ad79a7ed80cec8ae439ebead055762c35f38
parent b88abaaf

res/layout/call_log_list_item.xml

+65 −5
Original line number Diff line number Diff line
@@ -101,17 +101,77 @@ 
                android:contentDescription="@string/description_call_log_play_button"

            />

        </LinearLayout>

        <RelativeLayout

        <LinearLayout

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_toRightOf="@id/quick_contact_photo"

            android:layout_toLeftOf="@id/divider"

            android:layout_centerInParent="true"

            android:layout_alignWithParentIfMissing="true"

            android:layout_centerVertical="true"

            android:layout_marginLeft="@dimen/call_log_inner_margin"

            android:orientation="vertical"

        >

            <include layout="@layout/call_log_phone_call_details"/>

        </RelativeLayout>

            <TextView

                android:id="@+id/name"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:textColor="?attr/call_log_primary_text_color"

                android:textSize="18sp"

                android:singleLine="true"

            />

            <TextView

                android:id="@+id/number"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:textColor="?attr/call_log_secondary_text_color"

                android:textSize="14sp"

                android:singleLine="true"

            />

            <LinearLayout

                android:id="@+id/call_type"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

            >

                <view

                    class="com.android.contacts.calllog.CallTypeIconsView"

                    android:id="@+id/call_type_icons"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginRight="@dimen/call_log_icon_margin"

                    android:layout_gravity="center_vertical"

                />

                <TextView

                    android:id="@+id/call_type_name"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginRight="@dimen/call_log_inner_margin"

                    android:layout_gravity="center_vertical"

                    android:textColor="?attr/call_log_secondary_text_color"

                    android:textSize="14sp"

                    android:singleLine="true"

                />

                <TextView

                    android:id="@+id/call_type_separator"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_marginRight="@dimen/call_log_inner_margin"

                    android:layout_gravity="center_vertical"

                    android:textColor="?attr/call_log_secondary_text_color"

                    android:textSize="14sp"

                    android:text="@string/call_log_type_date_separator"

                    android:singleLine="true"

                />

                <TextView

                    android:id="@+id/date"

                    android:layout_width="wrap_content"

                    android:layout_height="wrap_content"

                    android:layout_gravity="center_vertical"

                    android:textColor="?attr/call_log_secondary_text_color"

                    android:textSize="14sp"

                    android:singleLine="true"

                />

            </LinearLayout>

        </LinearLayout>

    </RelativeLayout>



    <TextView

res/layout/call_log_phone_call_details.xml

deleted100644 → 0
+0 −88
Original line number Diff line number Diff line 
<?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.

-->



<merge xmlns:android="http://schemas.android.com/apk/res/android">

    <LinearLayout

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentLeft="true"

        android:layout_centerInParent="true"

        android:gravity="center_vertical"

        android:orientation="vertical"

    >

        <TextView

            android:id="@+id/name"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="?attr/call_log_primary_text_color"

            android:textSize="18sp"

            android:singleLine="true"

        />

        <TextView

            android:id="@+id/number"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:textColor="?attr/call_log_secondary_text_color"

            android:textSize="14sp"

            android:singleLine="true"

        />

        <LinearLayout

            android:id="@+id/call_type"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:orientation="horizontal"

        >

            <view

                class="com.android.contacts.calllog.CallTypeIconsView"

                android:id="@+id/call_type_icons"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginRight="@dimen/call_log_icon_margin"

                android:layout_gravity="center_vertical"

            />

            <TextView

                android:id="@+id/call_type_name"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginRight="@dimen/call_log_inner_margin"

                android:layout_gravity="center_vertical"

                android:textColor="?attr/call_log_secondary_text_color"

                android:textSize="14sp"

                android:singleLine="true"

            />

            <TextView

                android:id="@+id/call_type_separator"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_marginRight="@dimen/call_log_inner_margin"

                android:layout_gravity="center_vertical"

                android:textColor="?attr/call_log_secondary_text_color"

                android:textSize="14sp"

                android:text="@string/call_log_type_date_separator"

                android:singleLine="true"

            />

            <TextView

                android:id="@+id/date"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_gravity="center_vertical"

                android:textColor="?attr/call_log_secondary_text_color"

                android:textSize="14sp"

                android:singleLine="true"

            />

        </LinearLayout>

    </LinearLayout>

</merge>