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

Commit 0dfccc8f authored by Danny Baumann's avatar Danny Baumann Committed by Gerrit Code Review
Browse files

Fix up call stats code.

The details view still needs more visual overhaul, but at least it
_works_ now.

Change-Id: I97f62c77d032de08f33d7ba76478008719e56ef1
parent 315d9119
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:paddingTop="?android:attr/actionBarSize"
    android:orientation="vertical"
    android:divider="?android:attr/dividerHorizontal"
    android:showDividers="end"
+73 −192
Original line number Diff line number Diff line
@@ -15,211 +15,92 @@
     limitations under the License.
-->

<com.android.dialer.widget.AnchoredScrollView
    xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:ex="http://schemas.android.com/apk/res/com.android.dialer"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    ex:anchorView="@+id/photo_text_bar_dummy"
    ex:anchoredView="@+id/controls" >

    <RelativeLayout
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:id="@+id/call_stats_detail"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
        android:visibility="gone" >

        <!-- This layout defines the position of the scroll anchor.
             Sizes are supposed to match their counterpart in controls -->
        <RelativeLayout
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
    android:orientation="vertical"
            android:layout_alignParentTop="true" >

            <!-- Contact photo placeholder -->
            <com.android.contacts.common.widget.ProportionalLayout
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
    android:layout_alignParentStart="true"
                android:id="@+id/photo_dummy"
                ex:direction="widthToHeight"
                ex:ratio="0.5" >

                <!-- Proportional layout requires a view in it. -->
                <View
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content" />

            </com.android.contacts.common.widget.ProportionalLayout>

            <!-- Contact name placeholder -->
            <View
                android:id="@+id/photo_text_bar_dummy"
                android:layout_width="match_parent"
                android:layout_height="42dip"
                android:layout_alignBottom="@id/photo_dummy"
                android:layout_alignParentStart="true" />

        </RelativeLayout>
    android:layout_alignParentTop="true"
    android:background="@color/background_dialer_details_list_items" >

        <!-- The actual details -->
    <!-- Caller information "card" -->
    <LinearLayout
        android:id="@+id/caller_information"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
            android:layout_below="@id/controls" >

            <include layout="@layout/call_stats_detail_info" />
        </LinearLayout>

        <!-- The contents of the title block -->

        <RelativeLayout
            android:id="@+id/controls"
            android:layout_width="match_parent"
            android:layout_height="wrap_content"
            android:layout_alignParentStart="true"
            android:layout_alignParentTop="true" >
        android:paddingStart="@dimen/call_detail_horizontal_margin"
        android:paddingTop="@dimen/call_detail_top_margin"
        android:paddingBottom="@dimen/call_detail_bottom_margin"
        android:baselineAligned="false"
        android:orientation="horizontal"
        android:translationZ="@dimen/call_detail_translation_z"
        android:focusable="true"
        android:background="@color/background_dialer_white" >

            <com.android.contacts.common.widget.ProportionalLayout
                android:id="@+id/contact_background_sizer"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
        <QuickContactBadge
            android:id="@+id/quick_contact_photo"
            android:layout_width="@dimen/contact_photo_size"
            android:layout_height="@dimen/contact_photo_size"
            android:layout_alignParentStart="true"
                ex:direction="widthToHeight"
                ex:ratio="0.5" >

                <ImageView
                    android:id="@+id/contact_background"
                    android:layout_width="match_parent"
                    android:layout_height="0dip"
                    android:adjustViewBounds="true"
                    android:scaleType="centerCrop" />

            </com.android.contacts.common.widget.ProportionalLayout>
            android:layout_gravity="top"
            android:layout_marginTop="3dp"
            android:focusable="true"
            />

        <LinearLayout
                android:id="@+id/separator"
                android:layout_width="match_parent"
                android:layout_height="1dip"
                android:layout_below="@+id/contact_background_sizer"
                android:background="@color/background_dialer_light" />

            <View
                android:id="@+id/photo_text_bar"
                android:layout_width="match_parent"
                android:layout_height="42dip"
                android:layout_alignBottom="@id/contact_background_sizer"
                android:layout_alignParentStart="true"
                android:background="#7F000000" />

            <ImageView
                android:id="@+id/main_action"
            android:layout_width="wrap_content"
                android:layout_height="0dip"
                android:layout_alignBottom="@id/photo_text_bar"
                android:layout_alignEnd="@id/photo_text_bar"
                android:layout_alignTop="@id/photo_text_bar"
                android:layout_marginEnd="@dimen/call_log_outer_margin"
                android:scaleType="center" />

            android:layout_height="wrap_content"
            android:orientation="vertical"
            android:gravity="center_vertical"
            android:layout_marginStart="@dimen/call_detail_horizontal_margin"
            >
            <TextView
                android:id="@+id/header_text"
                android:id="@+id/caller_name"
                android:layout_width="wrap_content"
                android:layout_height="0dip"
                android:layout_alignBottom="@id/photo_text_bar"
                android:layout_alignStart="@id/photo_text_bar"
                android:layout_alignTop="@id/photo_text_bar"
                android:layout_marginStart="@dimen/call_detail_contact_name_margin"
                android:layout_marginEnd="@dimen/call_log_inner_margin"
                android:layout_toStartOf="@id/main_action"
                android:gravity="center_vertical"
                android:layout_height="wrap_content"
                android:textColor="?attr/call_log_primary_text_color"
                android:textSize="@dimen/call_log_primary_text_size"
                android:includeFontPadding="false"
                android:layout_marginBottom="5dp"
                android:singleLine="true"
                android:textAppearance="?android:attr/textAppearanceMedium"
                android:textColor="?attr/call_log_header_color" />

            <ImageButton
                android:id="@+id/main_action_push_layer"
                android:layout_width="match_parent"
                android:layout_height="match_parent"
                android:layout_alignBottom="@id/contact_background_sizer"
                android:layout_alignStart="@id/contact_background_sizer"
                android:layout_alignEnd="@id/contact_background_sizer"
                android:layout_alignTop="@id/contact_background_sizer"
                android:background="?android:attr/selectableItemBackground" />

            <FrameLayout
                android:id="@+id/call_and_sms"
                android:layout_width="match_parent"
                android:layout_height="@dimen/call_log_list_item_height"
                android:layout_below="@id/main_action_push_layer"
                android:layout_marginBottom="@dimen/call_detail_button_spacing"
                android:layout_marginTop="@dimen/call_detail_button_spacing"
                android:background="@color/background_dialer_list_items"
                android:gravity="center_vertical" >

                <LinearLayout
                    android:id="@+id/call_and_sms_main_action"
                    android:layout_width="match_parent"
                    android:layout_height="match_parent"
                    android:background="?android:attr/selectableItemBackground"
                    android:focusable="true"
                    android:orientation="horizontal" >

                    <LinearLayout
                        android:layout_width="0dip"
                        android:layout_height="match_parent"
                        android:layout_weight="1"
                        android:gravity="center_vertical"
                        android:orientation="vertical"
                        android:paddingStart="@dimen/call_log_indent_margin" >

                />
            <TextView
                            android:id="@+id/call_and_sms_text"
                android:id="@+id/caller_number"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                            android:ellipsize="end"
                            android:paddingEnd="@dimen/call_log_icon_margin"
                android:textColor="?attr/call_log_secondary_text_color"
                android:textSize="@dimen/call_log_secondary_text_size"
                android:layout_marginBottom="1dp"
                android:singleLine="true"
                            android:textAppearance="?android:attr/textAppearanceMedium"
                            android:textColor="?attr/call_log_primary_text_color" />

                />
            <TextView
                            android:id="@+id/call_and_sms_label"
                android:id="@+id/phone_account_label"
                android:layout_width="wrap_content"
                android:layout_height="wrap_content"
                            android:ellipsize="end"
                            android:paddingEnd="@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:textAllCaps="true"
                            android:textAppearance="?android:attr/textAppearanceSmall"
                            android:textColor="?attr/call_log_primary_text_color" />
                android:visibility="gone"
                />
        </LinearLayout>

                    <View
                        android:id="@+id/call_and_sms_divider"
                        android:layout_width="1px"
                        android:layout_height="32dip"
                        android:layout_gravity="center_vertical"
                        android:background="@color/background_dialer_light" />

                    <ImageView
                        android:id="@+id/call_and_sms_icon"
                        android:layout_width="@color/call_log_voicemail_highlight_color"
                        android:layout_height="match_parent"
                        android:background="?android:attr/selectableItemBackground"
                        android:focusable="true"
                        android:gravity="center"
                        android:paddingStart="@dimen/call_log_inner_margin"
                        android:paddingEnd="@dimen/call_log_outer_margin"
                        android:scaleType="centerInside" />

    </LinearLayout>

            </FrameLayout>
    <TextView
        android:id="@+id/header_text"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:singleLine="true"
        android:textAppearance="?android:attr/textAppearanceMedium"
        android:textColor="?attr/call_log_header_color" />

        </RelativeLayout>
    <!-- The actual details -->
    <LinearLayout
        android:layout_width="match_parent"
        android:layout_height="wrap_content">

    </RelativeLayout>
        <include layout="@layout/call_stats_detail_info" />
    </LinearLayout>

</com.android.dialer.widget.AnchoredScrollView>
</LinearLayout>
+34 −34
Original line number Diff line number Diff line
@@ -16,12 +16,13 @@
-->

<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:ex="http://schemas.android.com/apk/res/com.android.dialer"
    android:id="@+id/call_stats_info"
    android:layout_width="wrap_content"
    android:layout_height="wrap_content"
    android:layout_marginStart="@dimen/call_detail_contact_name_margin"
    android:layout_marginTop="@dimen/call_log_outer_margin" >
    android:paddingStart="@dimen/call_detail_horizontal_margin"
    android:paddingEnd="@dimen/call_log_outer_margin"
    android:paddingTop="@dimen/call_log_inner_margin"
    android:paddingBottom="@dimen/call_log_inner_margin">

    <TextView
        android:id="@+id/date_filter"
@@ -51,8 +52,8 @@
            android:layout_weight="1"
            android:layout_below="@id/date_filter"
            android:layout_marginStart="@dimen/call_log_icon_margin"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:textColor="@color/secondary_text_color" />
            android:textColor="?attr/call_log_primary_text_color"
            android:textSize="@dimen/call_log_primary_text_size" />

    </LinearLayout>

@@ -62,8 +63,8 @@
        android:layout_height="wrap_content"
        android:layout_below="@id/total_container"
        android:layout_marginBottom="@dimen/call_log_inner_margin"
        android:textAppearance="?android:attr/textAppearanceSmall"
        android:textColor="@color/secondary_text_color" />
        android:textColor="?attr/call_log_secondary_text_color"
        android:textSize="@dimen/call_log_secondary_text_size" />

    <com.android.dialer.widget.PieChartView
        android:id="@+id/pie_chart"
@@ -71,8 +72,7 @@
        android:layout_height="@dimen/call_stats_details_chart_size"
        android:layout_alignParentEnd="true"
        android:layout_centerVertical="true"
        android:layout_below="@id/total_duration"
        ex:outlineColor="@color/call_stats_bar_background" />
        android:layout_below="@id/total_duration" />

    <LinearLayout
        android:layout_width="0dp"
@@ -96,11 +96,11 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content" >

                <ImageView
                <com.android.dialer.calllog.CallTypeIconsView
                    android:id="@+id/in_icon"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
                    android:src="@drawable/ic_call_incoming_holo_dark" />
                    android:layout_gravity="center_vertical" />

                <TextView
                    android:id="@+id/in_summary"
@@ -108,8 +108,8 @@
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
                    android:layout_marginStart="@dimen/call_log_icon_margin"
                    android:textAppearance="?android:attr/textAppearanceSmall"
                    android:textColor="@color/secondary_text_color" />
                    android:textColor="?attr/call_log_primary_text_color"
                    android:textSize="@dimen/call_log_primary_text_size" />

            </LinearLayout>

@@ -117,15 +117,15 @@
                android:id="@+id/in_count"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textColor="@color/secondary_text_color" />
                android:textColor="?attr/call_log_secondary_text_color"
                android:textSize="@dimen/call_log_secondary_text_size" />

            <TextView
                android:id="@+id/in_duration"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textColor="@color/secondary_text_color" />
                android:textColor="?attr/call_log_secondary_text_color"
                android:textSize="@dimen/call_log_secondary_text_size" />

        </LinearLayout>

@@ -141,11 +141,11 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content" >

                <ImageView
                <com.android.dialer.calllog.CallTypeIconsView
                    android:id="@+id/out_icon"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
                    android:src="@drawable/ic_call_outgoing_holo_dark" />
                    android:layout_gravity="center_vertical" />

                <TextView
                    android:id="@+id/out_summary"
@@ -153,8 +153,8 @@
                    android:layout_height="wrap_content"
                    android:layout_weight="1"
                    android:layout_marginStart="@dimen/call_log_icon_margin"
                    android:textAppearance="?android:attr/textAppearanceSmall"
                    android:textColor="@color/secondary_text_color" />
					android:textColor="?attr/call_log_primary_text_color"
                    android:textSize="@dimen/call_log_primary_text_size" />

            </LinearLayout>

@@ -162,15 +162,15 @@
                android:id="@+id/out_count"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textColor="@color/secondary_text_color" />
                android:textColor="?attr/call_log_secondary_text_color"
                android:textSize="@dimen/call_log_secondary_text_size" />

            <TextView
                android:id="@+id/out_duration"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textColor="@color/secondary_text_color" />
                android:textColor="?attr/call_log_secondary_text_color"
                android:textSize="@dimen/call_log_secondary_text_size" />

        </LinearLayout>

@@ -185,19 +185,19 @@
                android:layout_width="match_parent"
                android:layout_height="wrap_content" >

                <ImageView
                <com.android.dialer.calllog.CallTypeIconsView
                    android:id="@+id/missed_icon"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
                    android:layout_gravity="center_vertical"
                    android:src="@drawable/ic_call_missed_holo_dark" />
                    android:layout_gravity="center_vertical" />

                <TextView
                    android:id="@+id/missed_summary"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:layout_marginStart="@dimen/call_log_icon_margin"
                    android:textAppearance="?android:attr/textAppearanceSmall"
                    android:textColor="@color/secondary_text_color" />
                    android:textColor="?attr/call_log_primary_text_color"
                    android:textSize="@dimen/call_log_primary_text_size" />

            </LinearLayout>

@@ -205,8 +205,8 @@
                android:id="@+id/missed_count"
                android:layout_width="match_parent"
                android:layout_height="wrap_content"
                android:textAppearance="?android:attr/textAppearanceSmall"
                android:textColor="@color/secondary_text_color" />
                android:textColor="?attr/call_log_secondary_text_color"
                android:textSize="@dimen/call_log_secondary_text_size" />

        </LinearLayout>

+9 −10
Original line number Diff line number Diff line
@@ -19,10 +19,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
    android:layout_width="match_parent"
    android:layout_height="match_parent"
    android:paddingTop="?android:attr/actionBarSize"
    android:divider="?android:attr/dividerHorizontal"
    android:orientation="vertical"
    android:showDividers="end" >
    android:showDividers="end"
    android:background="@color/background_dialer_list_items" >

    <LinearLayout
        android:id="@+id/call_stats_header"
@@ -70,17 +70,16 @@
            android:layout_height="match_parent"
            android:divider="@null"
            android:fadingEdge="none"
            android:scrollbarStyle="outsideOverlay" />
            android:scrollbarStyle="outsideOverlay"
            android:background="@color/background_dialer_list_items" />

        <TextView
            android:id="@android:id/empty"
        <include
            android:id="@+id/empty_list_view"
            android:layout_width="match_parent"
            android:layout_height="match_parent"
            android:layout_marginTop="@dimen/empty_message_top_margin"
            android:gravity="center"
            android:text="@string/recentCalls_empty"
            android:textAppearance="?android:attr/textAppearanceLarge"
            android:textColor="?android:attr/textColorSecondary" />
            layout="@layout/empty_list_view"
            android:visibility="gone"/>

    </FrameLayout>

</LinearLayout>
+71 −87

File changed.

Preview size limit exceeded, changes collapsed.

Loading