diff options
| author | Andrew Lee <anwlee@google.com> | 2015-05-14 21:26:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-05-14 21:26:02 +0000 |
| commit | b9cdf42470a66d65dfdb3d0836291dd08f1570f5 (patch) | |
| tree | 10c77522af07d9900a482c1f03a04b810846e704 /res | |
| parent | 9a7892e81c863180cc7db3fc450aded8b8232058 (diff) | |
| parent | e5618db1787ced7494ecc6d24e0058703c183692 (diff) | |
am e5618db1: am e35ce7c7: am 46b5395d: Merge "Don\'t set voicemail status message in Call Log." into mnc-dev
* commit 'e5618db1787ced7494ecc6d24e0058703c183692':
Don't set voicemail status message in Call Log.
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/call_log_fragment.xml | 43 |
1 files changed, 12 insertions, 31 deletions
diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml index a5a307207..68e306074 100644 --- a/res/layout/call_log_fragment.xml +++ b/res/layout/call_log_fragment.xml @@ -15,42 +15,23 @@ --> <!-- Layout parameters are set programmatically. --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" - android:divider="?android:attr/dividerHorizontal" - android:showDividers="end" android:background="@color/background_dialer_call_log"> - <FrameLayout - android:id="@+id/voicemail_status" + <android.support.v7.widget.RecyclerView android:id="@+id/recycler_view" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:visibility="gone"> + android:layout_height="match_parent" + android:background="@color/background_dialer_call_log" + android:paddingStart="@dimen/call_log_horizontal_margin" + android:paddingEnd="@dimen/call_log_horizontal_margin" /> - <include layout="@layout/call_log_voicemail_status" /> - - </FrameLayout> - - <FrameLayout + <include + android:id="@+id/empty_list_view" android:layout_width="match_parent" - android:layout_height="match_parent"> - - <android.support.v7.widget.RecyclerView android:id="@+id/recycler_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/background_dialer_call_log" - android:paddingStart="@dimen/call_log_horizontal_margin" - android:paddingEnd="@dimen/call_log_horizontal_margin" /> - - <include - android:id="@+id/empty_list_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - layout="@layout/empty_list_view" - android:visibility="gone" /> - - </FrameLayout> + android:layout_height="match_parent" + layout="@layout/empty_list_view" + android:visibility="gone" /> -</LinearLayout> +</FrameLayout> |