summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-16 16:54:05 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-07-16 16:54:05 +0000
commitb51139717b80045c279190c0c055a379dde70ef3 (patch)
tree1aad64a1065012e06008f907ea8e0908092aa5f7 /res
parent4fd6bf292a04bb5d709e8a8d3fed643e1607c01e (diff)
parent3cf92c747c54fa44240be5ba78cbc8eb6e3b8cd5 (diff)
downloadpackages_apps_Dialer-b51139717b80045c279190c0c055a379dde70ef3.tar.gz
packages_apps_Dialer-b51139717b80045c279190c0c055a379dde70ef3.tar.bz2
packages_apps_Dialer-b51139717b80045c279190c0c055a379dde70ef3.zip
am 3cf92c74: Merge "Update Dialer permissions UI per mocks" into mnc-dev
* commit '3cf92c747c54fa44240be5ba78cbc8eb6e3b8cd5': Update Dialer permissions UI per mocks
Diffstat (limited to 'res')
-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.xml3
-rw-r--r--res/layout/empty_content_view.xml9
-rw-r--r--res/layout/speed_dial_fragment.xml3
4 files changed, 18 insertions, 10 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>