diff options
| author | Andrew Lee <anwlee@google.com> | 2015-06-04 21:04:53 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-06-04 21:04:53 +0000 |
| commit | d7a18b77708d1dea78d5908f87f67e749c7c1b4c (patch) | |
| tree | a30ba257a4219be7c608d149cb2c20485e95014f /res | |
| parent | 742a26ab570eb9a7fde14bedbdf55691409d4dff (diff) | |
| parent | 16249d19754ae21bc31b1187dc42e51d86bdbff6 (diff) | |
am 16249d19: Merge "Move VM playback from details to call log." into mnc-dev
* commit '16249d19754ae21bc31b1187dc42e51d86bdbff6':
Move VM playback from details to call log.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/call_detail.xml | 6 | ||||
| -rw-r--r-- | res/layout/call_log_list_item_actions.xml | 19 | ||||
| -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 |