From 267e9ebd056ec4973c4b37c38f949e863de4f24c Mon Sep 17 00:00:00 2001
From: Andrew Lee <anwlee@google.com>
Date: Tue, 2 Jun 2015 16:43:01 -0700
Subject: 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
---
 res/layout/call_detail.xml                |  6 --
 res/layout/call_log_list_item_actions.xml | 19 ++-----
 res/layout/playback_layout.xml            | 92 -------------------------------
 res/layout/voicemail_playback_layout.xml  | 92 +++++++++++++++++++++++++++++++
 4 files changed, 97 insertions(+), 112 deletions(-)
 delete mode 100644 res/layout/playback_layout.xml
 create mode 100644 res/layout/voicemail_playback_layout.xml

(limited to 'res/layout')

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">
@@ -37,20 +42,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/playback_layout.xml
deleted file mode 100644
index 96feba648..000000000
--- a/res/layout/playback_layout.xml
+++ /dev/null
@@ -1,92 +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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:background="@color/background_dialer_call_log_list_item">
-
-    <RelativeLayout
-        android:id="@+id/seek_container"
-        android:layout_width="match_parent"
-        android:layout_height="80dp"
-        android:layout_marginTop="@dimen/call_detail_button_spacing">
-
-        <!-- SeekBar left-right margin decreased from redlines 72dp by 8dp to account for
-             half thumb width (thumb is 16dp).
-             Vertically, SeekBar and rate buttons should be below centre, position achieved by
-             making them centred but giving a difference between top and bottom padding,
-             difference is currently 10dp. -->
-        <SeekBar
-            android:id="@+id/playback_seek"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:progressDrawable="@drawable/seekbar_drawable"
-            android:thumb="@drawable/ic_voicemail_seek_handle"
-            android:thumbOffset="8dp"
-            android:progress="0"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp"
-            android:paddingTop="30dp"
-            android:paddingBottom="20dp"
-            android:layout_marginEnd="64dp"
-            android:layout_marginStart="64dp"
-            android:max="0"
-            android:layout_centerVertical="true"
-            android:contentDescription="@string/description_playback_seek" />
-
-        <TextView
-            android:id="@+id/playback_position_text"
-            android:layout_height="wrap_content"
-            android:layout_width="wrap_content"
-            android:textSize="14sp"
-            android:layout_alignParentTop="true"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="10dp" />
-
-    </RelativeLayout>
-
-    <!-- Playback, speakerphone buttons. -->
-    <LinearLayout
-        android:id="@+id/buttons_linear_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="horizontal">
-
-        <ImageButton
-            android:id="@+id/playback_start_stop"
-            android:layout_width="match_parent"
-            android:layout_height="58dp"
-            android:layout_marginEnd="@dimen/call_detail_button_spacing"
-            android:layout_weight="1"
-            android:background="?android:attr/selectableItemBackground"
-            android:src="@drawable/ic_hold_pause"
-            android:contentDescription="@string/voicemail_play_start_pause" />
-
-        <ImageButton
-            android:id="@+id/playback_speakerphone"
-            android:layout_width="match_parent"
-            android:layout_height="58dp"
-            android:layout_weight="1"
-            android:background="?android:attr/selectableItemBackground"
-            android:src="@drawable/ic_speakerphone_on"
-            android:contentDescription="@string/description_playback_speakerphone" />
-
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/voicemail_playback_layout.xml b/res/layout/voicemail_playback_layout.xml
new file mode 100644
index 000000000..96feba648
--- /dev/null
+++ b/res/layout/voicemail_playback_layout.xml
@@ -0,0 +1,92 @@
+<?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.
+-->
+
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical"
+    android:background="@color/background_dialer_call_log_list_item">
+
+    <RelativeLayout
+        android:id="@+id/seek_container"
+        android:layout_width="match_parent"
+        android:layout_height="80dp"
+        android:layout_marginTop="@dimen/call_detail_button_spacing">
+
+        <!-- SeekBar left-right margin decreased from redlines 72dp by 8dp to account for
+             half thumb width (thumb is 16dp).
+             Vertically, SeekBar and rate buttons should be below centre, position achieved by
+             making them centred but giving a difference between top and bottom padding,
+             difference is currently 10dp. -->
+        <SeekBar
+            android:id="@+id/playback_seek"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:progressDrawable="@drawable/seekbar_drawable"
+            android:thumb="@drawable/ic_voicemail_seek_handle"
+            android:thumbOffset="8dp"
+            android:progress="0"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:paddingTop="30dp"
+            android:paddingBottom="20dp"
+            android:layout_marginEnd="64dp"
+            android:layout_marginStart="64dp"
+            android:max="0"
+            android:layout_centerVertical="true"
+            android:contentDescription="@string/description_playback_seek" />
+
+        <TextView
+            android:id="@+id/playback_position_text"
+            android:layout_height="wrap_content"
+            android:layout_width="wrap_content"
+            android:textSize="14sp"
+            android:layout_alignParentTop="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="10dp" />
+
+    </RelativeLayout>
+
+    <!-- Playback, speakerphone buttons. -->
+    <LinearLayout
+        android:id="@+id/buttons_linear_layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+
+        <ImageButton
+            android:id="@+id/playback_start_stop"
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:layout_marginEnd="@dimen/call_detail_button_spacing"
+            android:layout_weight="1"
+            android:background="?android:attr/selectableItemBackground"
+            android:src="@drawable/ic_hold_pause"
+            android:contentDescription="@string/voicemail_play_start_pause" />
+
+        <ImageButton
+            android:id="@+id/playback_speakerphone"
+            android:layout_width="match_parent"
+            android:layout_height="58dp"
+            android:layout_weight="1"
+            android:background="?android:attr/selectableItemBackground"
+            android:src="@drawable/ic_speakerphone_on"
+            android:contentDescription="@string/description_playback_speakerphone" />
+
+    </LinearLayout>
+
+</LinearLayout>
-- 
cgit v1.2.3