summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorAndrew Lee <anwlee@google.com>2015-05-14 17:57:32 -0700
committerAndrew Lee <anwlee@google.com>2015-05-14 18:27:04 -0700
commit6ed11569195e1a267aacd14b5464f73f3578f738 (patch)
treed3ada29124323a3e13b53c8c38e57da5f6da5427 /res
parent4937a7223c63c7bbdfcc8463195d315cfdbb1aba (diff)
Remove VM StatusMessage code from Call Details.
This isn't used in any particular case right now. Remove some unused layouts too. Bug: 21170557 Change-Id: Ie21264d7059e73c905b2807b993b95c91a0dd3ec
Diffstat (limited to 'res')
-rw-r--r--res/layout/call_details_voicemail_header.xml15
-rw-r--r--res/layout/call_log_voicemail_status.xml46
2 files changed, 4 insertions, 57 deletions
diff --git a/res/layout/call_details_voicemail_header.xml b/res/layout/call_details_voicemail_header.xml
index f2a016b22..7f8b9b81e 100644
--- a/res/layout/call_details_voicemail_header.xml
+++ b/res/layout/call_details_voicemail_header.xml
@@ -18,14 +18,6 @@
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"
@@ -34,14 +26,15 @@
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"
- >
+ android:visibility="gone">
<!-- The voicemail fragment will be put here. -->
</LinearLayout>
-</LinearLayout> \ No newline at end of file
+
+</LinearLayout>
diff --git a/res/layout/call_log_voicemail_status.xml b/res/layout/call_log_voicemail_status.xml
deleted file mode 100644
index be808e400..000000000
--- a/res/layout/call_log_voicemail_status.xml
+++ /dev/null
@@ -1,46 +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.
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="?attr/call_log_voicemail_status_height"
- android:background="?attr/call_log_voicemail_status_background_color"
- >
- <TextView
- android:id="@+id/voicemail_status_message"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:layout_weight="1"
- android:paddingStart="@dimen/call_log_outer_margin"
- android:paddingEnd="@dimen/call_log_inner_margin"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="?attr/call_log_voicemail_status_text_color"
- />
- <TextView
- android:id="@+id/voicemail_status_action"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:gravity="center_vertical"
- android:paddingStart="@dimen/call_log_inner_margin"
- android:paddingEnd="@dimen/call_log_outer_margin"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="?attr/call_log_voicemail_status_action_text_color"
- android:background="?android:attr/selectableItemBackground"
- android:clickable="true"
- />
- </LinearLayout>
-</merge>