Include voicemail status layout in call details page.
The logic to populate message text in call details page would be done
in a follow up cl.
Bug: 5040099
Change-Id: I2ee28c98c1d7b240b428abf7a68fc8f020a385e5
diff --git a/res/layout/call_detail.xml b/res/layout/call_detail.xml
index 1e40964..c20df49 100644
--- a/res/layout/call_detail.xml
+++ b/res/layout/call_detail.xml
@@ -36,12 +36,24 @@
android:src="@drawable/ic_call_log_home"
/>
</LinearLayout>
+
+ <FrameLayout
+ android:id="@+id/voicemail_status"
+ android:layout_below="@id/action_bar"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:visibility="gone"
+ >
+ <include layout="@layout/call_log_voicemail_status"/>
+ </FrameLayout>
+
<ImageView
android:id="@+id/contact_background"
android:layout_width="match_parent"
android:layout_height="?attr/call_detail_contact_background_height"
android:layout_alignParentLeft="true"
- android:layout_below="@id/action_bar"
+ android:layout_below="@id/voicemail_status"
android:adjustViewBounds="true"
android:scaleType="centerCrop"
android:background="@drawable/ic_contact_picture"
diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml
index 573969b..2d0b9b5 100644
--- a/res/layout/call_log_fragment.xml
+++ b/res/layout/call_log_fragment.xml
@@ -19,7 +19,16 @@
android:layout_height="match_parent"
android:orientation="vertical"
>
- <include layout="@layout/call_log_voicemail_status"/>
+ <FrameLayout
+ android:id="@+id/voicemail_status"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentBottom="true"
+ android:visibility="gone">
+ <include layout="@layout/call_log_voicemail_status"
+ />
+ </FrameLayout>
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -29,7 +38,6 @@
android:layout_height="match_parent"
android:scrollbarStyle="outsideOverlay"
/>
-
<TextView android:id="@android:id/empty"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -39,4 +47,3 @@
/>
</FrameLayout>
</LinearLayout>
-
diff --git a/res/layout/call_log_voicemail_status.xml b/res/layout/call_log_voicemail_status.xml
index fee2210..c7def4d 100644
--- a/res/layout/call_log_voicemail_status.xml
+++ b/res/layout/call_log_voicemail_status.xml
@@ -13,41 +13,40 @@
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:id="@+id/voicemail_status"
- android:layout_width="match_parent"
- android:layout_height="?attr/call_log_voicemail_status_height"
- android:layout_alignParentLeft="true"
- android:layout_alignParentBottom="true"
- android:background="?attr/call_log_voicemail_status_background_color"
- android:baselineAligned="false"
- android:visibility="gone">
- <TextView
- android:id="@+id/voicemail_status_message"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="14dip"
- android:paddingRight="14dip"
- android:textColor="?attr/call_log_voicemail_status_text_color"
- android:layout_gravity="left"
- android:layout_weight="5"/>
- <View android:id="@+id/divider"
- android:layout_width="1px"
- android:layout_height="wrap_content"
- android:layout_marginTop="5dip"
- android:layout_marginBottom="5dip"
- android:layout_marginLeft="11dip"
- android:background="@drawable/divider_vertical_dark"/>
- <TextView
- android:id="@+id/voicemail_status_action"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="right"
- android:paddingLeft="14dip"
- android:paddingRight="14dip"
- android:textColor="?attr/call_log_voicemail_status_text_color"
- android:gravity="right"
- android:layout_alignParentRight="true"
- android:clickable="true"
- />
-</LinearLayout>
+<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="match_parent"
+ android:paddingLeft="14dip"
+ android:paddingRight="14dip"
+ android:textColor="?attr/call_log_voicemail_status_text_color"
+ android:layout_gravity="left"
+ android:layout_weight="5"
+ />
+ <View android:id="@+id/divider"
+ android:layout_width="1px"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="5dip"
+ android:layout_marginBottom="5dip"
+ android:layout_marginLeft="11dip"
+ android:background="@drawable/divider_vertical_dark"
+ />
+ <TextView
+ android:id="@+id/voicemail_status_action"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_gravity="right"
+ android:paddingLeft="14dip"
+ android:paddingRight="14dip"
+ android:textColor="?attr/call_log_voicemail_status_text_color"
+ android:gravity="right"
+ android:layout_alignParentRight="true"
+ android:clickable="true"
+ />
+ </LinearLayout>
+</merge>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3fa411c..9a73373 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -71,6 +71,10 @@
<item name="call_log_secondary_text_color">#FFFFFF</item>
<item name="call_log_secondary_background_color">#333333</item>
<item name="call_log_header_color">#33b5e5</item>
+ <!-- VoicemailStatus -->
+ <item name="call_log_voicemail_status_height">40dip</item>
+ <item name="call_log_voicemail_status_background_color">#FFFFE0</item>
+ <item name="call_log_voicemail_status_text_color">#000000</item>
</style>
<style name="ContactDetailActivityTheme" parent="android:Theme.Holo.Light">