Update layouts for call log list item actions.
+ Add icons for actions.
+ Revise layouts to match new visual appearance. Call Log actions
are now a linear layout with an icon and text.
+ Some style/redline tweaks.
+ Temporarily replaced animation logic with LinearLayout, to be
revisited.
Bug: 20433758
Change-Id: Ia13b6c9f583d673743488f2e93be5593a1fbf8dc
diff --git a/res/drawable-hdpi/ic_more_horiz_24dp.png b/res/drawable-hdpi/ic_more_horiz_24dp.png
new file mode 100644
index 0000000..ebfcb6f
--- /dev/null
+++ b/res/drawable-hdpi/ic_more_horiz_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_report_problem_24dp.png b/res/drawable-hdpi/ic_report_problem_24dp.png
new file mode 100644
index 0000000..cebb1c2
--- /dev/null
+++ b/res/drawable-hdpi/ic_report_problem_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_videocam_wht_24dp.png b/res/drawable-hdpi/ic_videocam_24dp.png
similarity index 100%
rename from res/drawable-hdpi/ic_videocam_wht_24dp.png
rename to res/drawable-hdpi/ic_videocam_24dp.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_voicemail_24dp.png b/res/drawable-hdpi/ic_voicemail_24dp.png
new file mode 100644
index 0000000..03a62e1
--- /dev/null
+++ b/res/drawable-hdpi/ic_voicemail_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_more_horiz_24dp.png b/res/drawable-mdpi/ic_more_horiz_24dp.png
new file mode 100644
index 0000000..8c0be8a
--- /dev/null
+++ b/res/drawable-mdpi/ic_more_horiz_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_report_problem_24dp.png b/res/drawable-mdpi/ic_report_problem_24dp.png
new file mode 100644
index 0000000..04365b9
--- /dev/null
+++ b/res/drawable-mdpi/ic_report_problem_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_videocam_wht_24dp.png b/res/drawable-mdpi/ic_videocam_24dp.png
similarity index 100%
rename from res/drawable-mdpi/ic_videocam_wht_24dp.png
rename to res/drawable-mdpi/ic_videocam_24dp.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_voicemail_24dp.png b/res/drawable-mdpi/ic_voicemail_24dp.png
new file mode 100644
index 0000000..e5aa7db
--- /dev/null
+++ b/res/drawable-mdpi/ic_voicemail_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_more_horiz_24dp.png b/res/drawable-xhdpi/ic_more_horiz_24dp.png
new file mode 100644
index 0000000..dbb87ca
--- /dev/null
+++ b/res/drawable-xhdpi/ic_more_horiz_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_report_problem_24dp.png b/res/drawable-xhdpi/ic_report_problem_24dp.png
new file mode 100644
index 0000000..a43fa3c
--- /dev/null
+++ b/res/drawable-xhdpi/ic_report_problem_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_videocam_wht_24dp.png b/res/drawable-xhdpi/ic_videocam_24dp.png
similarity index 100%
rename from res/drawable-xhdpi/ic_videocam_wht_24dp.png
rename to res/drawable-xhdpi/ic_videocam_24dp.png
Binary files differ
diff --git a/res/drawable-xhdpi/ic_voicemail_24dp.png b/res/drawable-xhdpi/ic_voicemail_24dp.png
new file mode 100644
index 0000000..59126d7
--- /dev/null
+++ b/res/drawable-xhdpi/ic_voicemail_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_more_horiz_24dp.png b/res/drawable-xxhdpi/ic_more_horiz_24dp.png
new file mode 100644
index 0000000..2036a9c
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_more_horiz_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_report_problem_24dp.png b/res/drawable-xxhdpi/ic_report_problem_24dp.png
new file mode 100644
index 0000000..807b9fa
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_report_problem_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_videocam_wht_24dp.png b/res/drawable-xxhdpi/ic_videocam_24dp.png
similarity index 100%
rename from res/drawable-xxhdpi/ic_videocam_wht_24dp.png
rename to res/drawable-xxhdpi/ic_videocam_24dp.png
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_voicemail_24dp.png b/res/drawable-xxhdpi/ic_voicemail_24dp.png
new file mode 100644
index 0000000..28b8e93
--- /dev/null
+++ b/res/drawable-xxhdpi/ic_voicemail_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_more_horiz_24dp.png b/res/drawable-xxxhdpi/ic_more_horiz_24dp.png
new file mode 100644
index 0000000..535f087
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_more_horiz_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_report_problem_24dp.png b/res/drawable-xxxhdpi/ic_report_problem_24dp.png
new file mode 100644
index 0000000..8683a2e
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_report_problem_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_videocam_24dp.png b/res/drawable-xxxhdpi/ic_videocam_24dp.png
new file mode 100644
index 0000000..ed20c07
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_videocam_24dp.png
Binary files differ
diff --git a/res/drawable-xxxhdpi/ic_voicemail_24dp.png b/res/drawable-xxxhdpi/ic_voicemail_24dp.png
new file mode 100644
index 0000000..820ff50
--- /dev/null
+++ b/res/drawable-xxxhdpi/ic_voicemail_24dp.png
Binary files differ
diff --git a/res/drawable/call_log_action_border.xml b/res/drawable/call_log_action_border.xml
new file mode 100644
index 0000000..fbb3559
--- /dev/null
+++ b/res/drawable/call_log_action_border.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2015 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
+ -->
+
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+ <item android:left="-1dp" android:right="-1dp" android:bottom="-1dp">
+ <shape android:shape="rectangle">
+ <stroke android:width="1dp" android:color="@color/call_log_action_divider" />
+ </shape>
+ </item>
+</layer-list>
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index 5928183..af8cb8b 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -35,127 +35,132 @@
android:paddingTop="@dimen/call_log_day_group_padding_top"
android:paddingBottom="@dimen/call_log_day_group_padding_bottom" />
- <!-- Linear layout to separate the primary area containing the contact badge and caller
- information and the secondary action (call details / play voicemail). -->
<android.support.v7.widget.CardView
android:id="@+id/call_log_row"
style="@style/CallLogCardStyle">
- <!-- Primary area containing the contact badge and caller information -->
<LinearLayout
- android:id="@+id/primary_action_view"
- android:background="?android:attr/selectableItemBackground"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="@dimen/call_log_start_margin"
- android:paddingEnd="@dimen/call_log_outer_margin"
- android:paddingTop="@dimen/call_log_vertical_padding"
- android:paddingBottom="@dimen/call_log_vertical_padding"
- android:orientation="horizontal"
- android:gravity="center_vertical"
- android:focusable="true"
- android:nextFocusRight="@+id/call_back_action"
- android:nextFocusLeft="@+id/quick_contact_photo" >
+ android:orientation="vertical">
- <QuickContactBadge
- android:id="@+id/quick_contact_photo"
- android:layout_width="@dimen/contact_photo_size"
- android:layout_height="@dimen/contact_photo_size"
- android:paddingTop="2dp"
- android:nextFocusRight="@id/primary_action_view"
- android:layout_gravity="top"
- android:focusable="true" />
-
+ <!-- Primary area containing the contact badge and caller information -->
<LinearLayout
- android:layout_width="0dp"
+ android:id="@+id/primary_action_view"
+ android:background="?android:attr/selectableItemBackground"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_weight="1"
- android:orientation="vertical"
+ android:paddingStart="@dimen/call_log_start_margin"
+ android:paddingEnd="@dimen/call_log_outer_margin"
+ android:paddingTop="@dimen/call_log_vertical_padding"
+ android:paddingBottom="@dimen/call_log_vertical_padding"
+ android:orientation="horizontal"
android:gravity="center_vertical"
- android:layout_marginStart="@dimen/call_log_start_margin">
+ android:focusable="true"
+ android:nextFocusRight="@+id/call_back_action"
+ android:nextFocusLeft="@+id/quick_contact_photo" >
- <TextView
- android:id="@+id/name"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_marginBottom="@dimen/call_log_name_margin_bottom"
- android:layout_marginEnd="@dimen/call_log_icon_margin"
- android:textColor="?attr/call_log_primary_text_color"
- android:textSize="@dimen/call_log_primary_text_size"
- android:singleLine="true" />
-
- <TextView
- android:id="@+id/voicemail_transcription"
- 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="@dimen/call_log_secondary_text_size"
- android:singleLine="true"
- android:ellipsize="marquee"
- android:visibility="gone" />
+ <QuickContactBadge
+ android:id="@+id/quick_contact_photo"
+ android:layout_width="@dimen/contact_photo_size"
+ android:layout_height="@dimen/contact_photo_size"
+ android:paddingTop="2dp"
+ android:nextFocusRight="@id/primary_action_view"
+ android:layout_gravity="top"
+ android:focusable="true" />
<LinearLayout
- android:id="@+id/call_type"
- android:layout_width="wrap_content"
+ android:layout_width="0dp"
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" />
+ android:layout_weight="1"
+ android:orientation="vertical"
+ android:gravity="center_vertical"
+ android:layout_marginStart="@dimen/call_log_list_item_info_margin_start">
<TextView
- android:id="@+id/call_location_and_date"
+ android:id="@+id/name"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/call_log_name_margin_bottom"
+ android:layout_marginEnd="@dimen/call_log_icon_margin"
+ android:textColor="?attr/call_log_primary_text_color"
+ android:textSize="@dimen/call_log_primary_text_size"
+ android:singleLine="true" />
+
+ <TextView
+ android:id="@+id/voicemail_transcription"
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="@dimen/call_log_secondary_text_size"
+ android:singleLine="true"
+ android:ellipsize="marquee"
+ android:visibility="gone" />
+
+ <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_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="@dimen/call_log_secondary_text_size"
+ android:singleLine="true" />
+
+ </LinearLayout>
+
+ <TextView
+ android:id="@+id/call_account_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="@dimen/call_log_secondary_text_size"
+ android:visibility="gone"
android:singleLine="true" />
</LinearLayout>
- <TextView
- android:id="@+id/call_account_label"
+ <ImageView
+ android:id="@+id/call_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical"
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:visibility="gone"
- android:singleLine="true" />
+ android:background="?android:attr/selectableItemBackgroundBorderless"
+ android:src="@drawable/ic_card_phone"
+ android:tint="@color/recent_call_log_item_phone_icon_tint"
+ android:alpha="0.3"
+ android:contentDescription="@string/description_call_log_call_action"
+ android:visibility="gone" />
</LinearLayout>
- <ImageView
- android:id="@+id/call_icon"
- android:layout_width="wrap_content"
+ <!-- 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"
- android:layout_gravity="center_vertical"
- android:layout_marginEnd="@dimen/call_log_icon_margin"
- android:background="?android:attr/selectableItemBackgroundBorderless"
- android:src="@drawable/ic_card_phone"
- android:tint="@color/recent_call_log_item_phone_icon_tint"
- android:alpha="0.3"
- android:contentDescription="@string/description_call_log_call_action"
- android:visibility="gone" />
+ android:layout_gravity="bottom" />
</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"
- android:layout_gravity="bottom" />
-
</android.support.v7.widget.CardView>
</LinearLayout>
diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml
index 8ef92bf..43da5d2 100644
--- a/res/layout/call_log_list_item_actions.xml
+++ b/res/layout/call_log_list_item_actions.xml
@@ -23,44 +23,70 @@
android:visibility="visible"
android:importantForAccessibility="1">
- <!-- Temporary border spacer. -->
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:layout_weight="1"
- android:background="#eeeeee" />
-
- <TextView
+ <LinearLayout
android:id="@+id/video_call_action"
- style="@style/CallLogActionsStyle"
- android:background="?android:attr/selectableItemBackground"
- android:text="@string/call_log_action_video_call"
+ style="@style/CallLogActionStyle"
android:nextFocusLeft="@+id/primary_action_view"
- android:nextFocusRight="@+id/voicemail_action" />
+ android:nextFocusRight="@+id/voicemail_action">
- <TextView
+ <ImageView
+ style="@style/CallLogActionIconStyle"
+ android:src="@drawable/ic_videocam_24dp" />
+
+ <TextView
+ style="@style/CallLogActionTextStyle"
+ android:text="@string/call_log_action_video_call" />
+
+ </LinearLayout>
+
+ <LinearLayout
android:id="@+id/voicemail_action"
- style="@style/CallLogActionsStyle"
- android:background="?android:attr/selectableItemBackground"
- android:text="@string/call_log_action_voicemail"
+ style="@style/CallLogActionStyle"
android:nextFocusLeft="@+id/video_call_action"
- android:nextFocusRight="@+id/details_action" />
+ android:nextFocusRight="@+id/details_action">
- <TextView
+ <ImageView
+ style="@style/CallLogActionIconStyle"
+ android:src="@drawable/ic_voicemail_24dp" />
+
+ <TextView
+ style="@style/CallLogActionTextStyle"
+ android:text="@string/call_log_action_voicemail"
+ android:nextFocusLeft="@+id/video_call_action"
+ android:nextFocusRight="@+id/details_action" />
+
+ </LinearLayout>
+
+ <LinearLayout
android:id="@+id/details_action"
- style="@style/CallLogActionsStyle"
- android:background="?android:attr/selectableItemBackground"
- android:text="@string/call_log_action_details"
+ style="@style/CallLogActionStyle"
android:nextFocusLeft="@+id/voicemail_action"
- android:nextFocusRight="@+id/report_action" />
+ android:nextFocusRight="@+id/report_action">
- <TextView
+ <ImageView
+ style="@style/CallLogActionIconStyle"
+ android:src="@drawable/ic_more_horiz_24dp" />
+
+ <TextView
+ style="@style/CallLogActionTextStyle"
+ android:text="@string/call_log_action_details" />
+
+ </LinearLayout>
+
+ <LinearLayout
android:id="@+id/report_action"
- style="@style/CallLogActionsStyle"
- android:background="?android:attr/selectableItemBackground"
- android:text="@string/call_log_action_report"
+ style="@style/CallLogActionStyle"
android:nextFocusLeft="@+id/details_action"
- android:nextFocusRight="@+id/primary_action_view"
- android:visibility="gone" />
+ android:nextFocusRight="@+id/primary_action_view">
+
+ <ImageView
+ style="@style/CallLogActionIconStyle"
+ android:src="@drawable/ic_report_problem_24dp" />
+
+ <TextView
+ style="@style/CallLogActionTextStyle"
+ android:text="@string/call_log_action_report" />
+
+ </LinearLayout>
</LinearLayout>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 25f203d..86ac9be 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -18,7 +18,7 @@
<!-- Primary text color in the Dialer -->
<color name="dialtacts_primary_text_color">#333333</color>
<!-- Secondary text color in the Dialer -->
- <color name="dialtacts_secondary_text_color">#737373</color>
+ <color name="dialtacts_secondary_text_color">#636363</color>
<color name="dialer_red_highlight_color">#ff1744</color>
<color name="dialer_green_highlight_color">#00c853</color>
@@ -100,4 +100,5 @@
<color name="floating_action_button_touch_tint">#80ffffff</color>
+ <color name="call_log_action_divider">#eeeeee</color>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index d4a36cf..b36b9d6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -28,11 +28,12 @@
<dimen name="call_log_icon_margin">4dp</dimen>
<dimen name="call_log_inner_margin">13dp</dimen>
<dimen name="call_log_outer_margin">8dp</dimen>
- <dimen name="call_log_start_margin">16dp</dimen>
+ <dimen name="call_log_start_margin">8dp</dimen>
<dimen name="call_log_indent_margin">24dp</dimen>
<dimen name="call_log_name_margin_bottom">2dp</dimen>
<dimen name="call_log_vertical_padding">12dp</dimen>
- <dimen name="call_log_list_item_height">56dip</dimen>
+ <dimen name="call_log_list_item_height">56dp</dimen>
+ <dimen name="call_log_list_item_info_margin_start">16dp</dimen>
<dimen name="show_call_history_list_item_height">72dp</dimen>
<!-- Size of contact photos in the call log and call details. -->
@@ -103,11 +104,10 @@
<dimen name="search_box_elevation">3dp</dimen>
<dimen name="call_log_action_height">48dp</dimen>
+ <dimen name="call_log_action_icon_margin_start">16dp</dimen>
+ <dimen name="call_log_action_icon_dimen">24dp</dimen>
<dimen name="call_log_action_horizontal_padding">24dp</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">64dp</dimen>
<dimen name="call_log_primary_text_size">14sp</dimen>
<dimen name="call_log_secondary_text_size">14sp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 2cd4aa3..d41f334 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -158,10 +158,18 @@
<item name="android:overScrollMode">always</item>
</style>
- <style name="CallLogActionsStyle">
+ <style name="CallLogActionStyle">
<item name="android:layout_width">match_parent</item>
<item name="android:layout_height">@dimen/call_log_action_height</item>
- <item name="android:gravity">start|center_vertical</item>
+ <item name="android:background">@drawable/call_log_action_border</item>
+ <item name="android:foreground">?android:attr/selectableItemBackground</item>
+ <item name="android:orientation">horizontal</item>
+ <item name="android:gravity">center_vertical</item>
+ </style>
+
+ <style name="CallLogActionTextStyle">
+ <item name="android:layout_width">match_parent</item>
+ <item name="android:layout_height">wrap_content</item>
<item name="android:paddingStart">@dimen/call_log_action_horizontal_padding</item>
<item name="android:paddingEnd">@dimen/call_log_action_horizontal_padding</item>
<item name="android:textColor">?attr/call_log_secondary_text_color</item>
@@ -171,6 +179,14 @@
<item name="android:singleLine">true</item>
</style>
+ <style name="CallLogActionIconStyle">
+ <item name="android:layout_width">@dimen/call_log_action_icon_dimen</item>
+ <item name="android:layout_height">@dimen/call_log_action_icon_dimen</item>
+ <item name="android:layout_marginStart">@dimen/call_log_action_icon_margin_start</item>
+ <item name="android:tint">?attr/call_log_secondary_text_color</item>
+ <item name="android:importantForAccessibility">no</item>
+ </style>
+
<style name="DismissButtonStyle">
<item name="android:paddingLeft">@dimen/dismiss_button_padding_start</item>
<item name="android:paddingRight">@dimen/dismiss_button_padding_end</item>
diff --git a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
index 3652900..2e12d9a 100644
--- a/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
+++ b/src/com/android/dialer/calllog/CallLogListItemViewHolder.java
@@ -65,13 +65,13 @@
/** The view containing call log item actions. Null until the ViewStub is inflated. */
public View actionsView;
/** The "video call" action button - assigned only when the action section is expanded. */
- public TextView videoCallButtonView;
+ public View videoCallButtonView;
/** The "voicemail" action button - assigned only when the action section is expanded. */
- public TextView voicemailButtonView;
+ public View voicemailButtonView;
/** The "details" action button - assigned only when the action section is expanded. */
- public TextView detailsButtonView;
+ public View detailsButtonView;
/** The "report" action button. */
- public TextView reportButtonView;
+ public View reportButtonView;
/**
* The row Id for the first call associated with the call log entry. Used as a key for the
@@ -217,19 +217,19 @@
}
if (videoCallButtonView == null) {
- videoCallButtonView = (TextView) actionsView.findViewById(R.id.video_call_action);
+ videoCallButtonView = actionsView.findViewById(R.id.video_call_action);
}
if (voicemailButtonView == null) {
- voicemailButtonView = (TextView) actionsView.findViewById(R.id.voicemail_action);
+ voicemailButtonView = actionsView.findViewById(R.id.voicemail_action);
}
if (detailsButtonView == null) {
- detailsButtonView = (TextView) actionsView.findViewById(R.id.details_action);
+ detailsButtonView = actionsView.findViewById(R.id.details_action);
}
if (reportButtonView == null) {
- reportButtonView = (TextView) actionsView.findViewById(R.id.report_action);
+ reportButtonView = actionsView.findViewById(R.id.report_action);
reportButtonView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
@@ -341,29 +341,6 @@
actionsView.setVisibility(View.GONE);
}
}
-
- if (actionsView != null) {
- final ViewTreeObserver observer = callLogEntryView.getViewTreeObserver();
- observer.addOnPreDrawListener(new ViewTreeObserver.OnPreDrawListener() {
- @Override
- public boolean onPreDraw() {
- ViewTreeObserver vto = observer;
- if (!vto.isAlive()) {
- vto = actionsView.getViewTreeObserver();
- }
- vto.removeOnPreDrawListener(this);
-
- // TODO: Animate, instead of immediately resizing.
- int currentHeight = primaryActionView.getHeight();
- int actionsHeight = actionsView.getVisibility() == View.VISIBLE
- ? actionsView.getHeight() : 0;
- callLogEntryView.getLayoutParams().height = currentHeight + actionsHeight;
- callLogEntryView.requestLayout();
-
- return false;
- }
- });
- }
}
public void expandVoicemailTranscriptionView(boolean isExpanded) {
diff --git a/src/com/android/dialer/calllog/CallTypeIconsView.java b/src/com/android/dialer/calllog/CallTypeIconsView.java
index ef729ae..31d4f4b 100644
--- a/src/com/android/dialer/calllog/CallTypeIconsView.java
+++ b/src/com/android/dialer/calllog/CallTypeIconsView.java
@@ -208,7 +208,7 @@
// We want the video call icon to be the same height as the call arrows, while keeping
// the same width aspect ratio.
Bitmap videoIcon = BitmapFactory.decodeResource(context.getResources(),
- R.drawable.ic_videocam_wht_24dp);
+ R.drawable.ic_videocam_24dp);
int scaledHeight = missed.getIntrinsicHeight();
int scaledWidth = (int) ((float) videoIcon.getWidth() *
((float) missed.getIntrinsicHeight() /
