diff options
author | Yorke Lee <yorkelee@google.com> | 2014-08-06 20:43:20 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-05 00:19:02 +0000 |
commit | 60df037df56f025e05a8918e13c27479226667ea (patch) | |
tree | 01a9b91d5f6fdf0fb99b80b7cc42ef255c2f0ffe /res | |
parent | 2fec47bc040148b4de1d5c32391cb0cd1a36f413 (diff) | |
parent | 257b6f27744dc528da719beb1a6d29cd9f72ea31 (diff) |
Merge "Allow voicemail playback view to scroll" into lmp-dev
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/call_detail.xml | 29 | ||||
-rw-r--r-- | res/layout/call_details_voicemail_header.xml | 47 |
2 files changed, 47 insertions, 29 deletions
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml index 2e38e2d99..35c41c0b3 100644 --- a/res/layout/call_detail.xml +++ b/res/layout/call_detail.xml @@ -87,35 +87,6 @@ </LinearLayout> </LinearLayout> - <FrameLayout - android:id="@+id/voicemail_status" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentStart="true" - android:layout_alignParentTop="true" - android:visibility="gone" - > - <include layout="@layout/call_log_voicemail_status"/> - </FrameLayout> - <TextView - android:id="@+id/voicemail_transcription" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="@dimen/call_detail_horizontal_margin" - android:paddingEnd="@dimen/call_detail_horizontal_margin" - android:paddingTop="@dimen/transcription_top_margin" - android:paddingBottom="@dimen/transcription_bottom_margin" /> - <LinearLayout - android:id="@+id/voicemail_container" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="@dimen/call_detail_button_spacing" - android:visibility="gone" - > - <!-- The voicemail fragment will be put here. --> - </LinearLayout> - <!-- 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_details_voicemail_header.xml b/res/layout/call_details_voicemail_header.xml new file mode 100644 index 000000000..f2a016b22 --- /dev/null +++ b/res/layout/call_details_voicemail_header.xml @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2009 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" > + + <FrameLayout + android:id="@+id/voicemail_status" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:visibility="gone" + > + <include layout="@layout/call_log_voicemail_status"/> + </FrameLayout> + <TextView + android:id="@+id/voicemail_transcription" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:paddingStart="@dimen/call_detail_horizontal_margin" + android:paddingEnd="@dimen/call_detail_horizontal_margin" + android:paddingTop="@dimen/transcription_top_margin" + android:paddingBottom="@dimen/transcription_bottom_margin" /> + <LinearLayout + android:id="@+id/voicemail_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingBottom="@dimen/call_detail_button_spacing" + android:visibility="gone" + > + <!-- The voicemail fragment will be put here. --> + </LinearLayout> +</LinearLayout>
\ No newline at end of file |