summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-06-02 16:43:01 -0700
committerAndrew Lee <anwlee@google.com>2015-06-03 16:53:03 -0700
commit267e9ebd056ec4973c4b37c38f949e863de4f24c (patch)
tree088d070a3f7c9a6fe55ec926933c68731d8fc25c /res
parentf024f336cd205f2d1501b02aef0adc0e1c9b5879 (diff)
Move VM playback from details to call log.
- Delete voicemail playback in the CallDetailActivity. + Add voicemail playback to the call log list items. + Move the VoicemailPlaybackPresenter to the CallLogFragment. + Fix some retaining state for both call log (expanded items), and preserve rotation/state functionality for voicemail playback. This included some changes to the Presenter logic. + Fix some tests. Bug: 21471763 Bug: 21170557 Change-Id: I30aae3a52c5bbf74a5075a9666343c337b1fc0df
Diffstat (limited to 'res')
-rw-r--r--res/layout/call_detail.xml6
-rw-r--r--res/layout/call_log_list_item_actions.xml19
-rw-r--r--res/layout/voicemail_playback_layout.xml (renamed from res/layout/playback_layout.xml)0
3 files changed, 5 insertions, 20 deletions
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index 5d1607edf..c07785159 100644
--- a/res/layout/call_detail.xml
+++ b/res/layout/call_detail.xml
@@ -87,12 +87,6 @@
</LinearLayout>
</LinearLayout>
- <com.android.dialer.voicemail.VoicemailPlaybackLayout
- android:id="@+id/voicemail_playback_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:visibility="gone" />
-
<!--
The list view is under everything.
It contains a first header element which is hidden under the controls UI.
diff --git a/res/layout/call_log_list_item_actions.xml b/res/layout/call_log_list_item_actions.xml
index d3e18be28..f1d0e9ec8 100644
--- a/res/layout/call_log_list_item_actions.xml
+++ b/res/layout/call_log_list_item_actions.xml
@@ -23,6 +23,11 @@
android:visibility="visible"
android:importantForAccessibility="1">
+ <com.android.dialer.voicemail.VoicemailPlaybackLayout
+ android:id="@+id/voicemail_playback_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content" />
+
<LinearLayout
android:id="@+id/video_call_action"
style="@style/CallLogActionStyle">
@@ -38,20 +43,6 @@
</LinearLayout>
<LinearLayout
- android:id="@+id/voicemail_action"
- style="@style/CallLogActionStyle">
-
- <ImageView
- style="@style/CallLogActionIconStyle"
- android:src="@drawable/ic_voicemail_24dp" />
-
- <TextView
- style="@style/CallLogActionTextStyle"
- android:text="@string/call_log_action_voicemail" />
-
- </LinearLayout>
-
- <LinearLayout
android:id="@+id/create_new_contact_action"
style="@style/CallLogActionStyle">
diff --git a/res/layout/playback_layout.xml b/res/layout/voicemail_playback_layout.xml
index 96feba648..96feba648 100644
--- a/res/layout/playback_layout.xml
+++ b/res/layout/voicemail_playback_layout.xml