diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-07-16 16:41:03 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-16 16:41:05 +0000 |
| commit | 3cf92c747c54fa44240be5ba78cbc8eb6e3b8cd5 (patch) | |
| tree | 32eb2b5c1411024360cc63cbbe9ed13e78463793 | |
| parent | 5559d41658f62e407e7f59c7f20c2a21555aa024 (diff) | |
| parent | 63825c8c150676a563719a00aa02b42c9775189c (diff) | |
Merge "Update Dialer permissions UI per mocks" into mnc-dev
| -rw-r--r-- | res/layout/all_contacts_fragment.xml (renamed from res/layout/show_all_contacts_fragment.xml) | 13 | ||||
| -rw-r--r-- | res/layout/call_log_fragment.xml | 3 | ||||
| -rw-r--r-- | res/layout/empty_content_view.xml | 9 | ||||
| -rw-r--r-- | res/layout/speed_dial_fragment.xml | 3 | ||||
| -rw-r--r-- | src/com/android/dialer/list/AllContactsFragment.java | 2 |
5 files changed, 19 insertions, 11 deletions
diff --git a/res/layout/show_all_contacts_fragment.xml b/res/layout/all_contacts_fragment.xml index 3b501fb88..2ca013a19 100644 --- a/res/layout/show_all_contacts_fragment.xml +++ b/res/layout/all_contacts_fragment.xml @@ -42,12 +42,13 @@ android:fastScrollEnabled="true" android:fadingEdge="none" android:nestedScrollingEnabled="true" /> - </FrameLayout> - <com.android.dialer.widget.EmptyContentView - android:id="@+id/empty_list_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:visibility="gone"/> + <com.android.dialer.widget.EmptyContentView + android:id="@+id/empty_list_view" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" + android:visibility="gone"/> + </FrameLayout> </LinearLayout> diff --git a/res/layout/call_log_fragment.xml b/res/layout/call_log_fragment.xml index 3a7013d57..f69c5139f 100644 --- a/res/layout/call_log_fragment.xml +++ b/res/layout/call_log_fragment.xml @@ -30,7 +30,8 @@ <com.android.dialer.widget.EmptyContentView android:id="@+id/empty_list_view" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" android:visibility="gone" /> </FrameLayout> diff --git a/res/layout/empty_content_view.xml b/res/layout/empty_content_view.xml index 18633d0f9..d8f27aad8 100644 --- a/res/layout/empty_content_view.xml +++ b/res/layout/empty_content_view.xml @@ -25,12 +25,13 @@ android:id="@+id/emptyListViewMessage" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="84dp" android:gravity="center_horizontal|top" android:textSize="@dimen/empty_list_message_text_size" android:textColor="@color/empty_list_text_color" android:paddingRight="16dp" - android:paddingLeft="16dp" /> + android:paddingLeft="16dp" + android:paddingTop="8dp" + android:paddingBottom="8dp" /> <TextView android:id="@+id/emptyListViewAction" @@ -47,4 +48,8 @@ android:clickable="true" style="@style/TextActionStyle" /> + <Space + android:layout_width="match_parent" + android:layout_height="40dp" /> + </merge> diff --git a/res/layout/speed_dial_fragment.xml b/res/layout/speed_dial_fragment.xml index 55dd158d2..5b6ce4fb8 100644 --- a/res/layout/speed_dial_fragment.xml +++ b/res/layout/speed_dial_fragment.xml @@ -44,7 +44,8 @@ <com.android.dialer.widget.EmptyContentView android:id="@+id/empty_list_view" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="center" android:visibility="gone"/> </FrameLayout> diff --git a/src/com/android/dialer/list/AllContactsFragment.java b/src/com/android/dialer/list/AllContactsFragment.java index 00b629c2b..19d8a438a 100644 --- a/src/com/android/dialer/list/AllContactsFragment.java +++ b/src/com/android/dialer/list/AllContactsFragment.java @@ -115,7 +115,7 @@ public class AllContactsFragment extends ContactEntryListFragment<ContactEntryLi @Override protected View inflateView(LayoutInflater inflater, ViewGroup container) { - return inflater.inflate(R.layout.show_all_contacts_fragment, null); + return inflater.inflate(R.layout.all_contacts_fragment, null); } @Override |