summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-04-22 16:51:30 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-22 16:51:30 +0000
commitcd1fa3922c10f1951f845386cc43dabf69e31ccc (patch)
treeb1891c30bc2f04c23f7d34c1256256c3cc01f73b /res
parent0e80d8797ccc1da7157d2d85da9e92733eaa2946 (diff)
parent4cde566de5f54b6bdd305229c3134068cdde4bbd (diff)
Merge "Move call shortcut cards to their own list"
Diffstat (limited to 'res')
-rw-r--r--res/layout/call_log_list_item.xml2
-rw-r--r--res/layout/lists_fragment.xml9
-rw-r--r--res/layout/phone_favorites_fragment.xml1
3 files changed, 11 insertions, 1 deletions
diff --git a/res/layout/call_log_list_item.xml b/res/layout/call_log_list_item.xml
index a33ec7d7c..953efc403 100644
--- a/res/layout/call_log_list_item.xml
+++ b/res/layout/call_log_list_item.xml
@@ -38,6 +38,7 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:baselineAligned="false"
android:orientation="horizontal"
android:gravity="center_vertical"
>
@@ -48,7 +49,6 @@
android:layout_width="0dp"
android:layout_weight="1"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
android:padding="@dimen/call_log_outer_margin"
android:orientation="horizontal"
android:gravity="center_vertical"
diff --git a/res/layout/lists_fragment.xml b/res/layout/lists_fragment.xml
index 740dc2af6..6ed0f856e 100644
--- a/res/layout/lists_fragment.xml
+++ b/res/layout/lists_fragment.xml
@@ -19,7 +19,16 @@
android:layout_height="match_parent"
android:paddingTop="?android:attr/actionBarSize"
android:orientation="vertical"
+ android:animateLayoutChanges="true"
android:id="@+id/lists_frame">
+ <ListView
+ android:id="@+id/shortcut_card_list"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/actionbar_background_color"
+ android:clipToPadding="false"
+ android:fadingEdge="none"
+ android:divider="@null" />
<com.android.dialer.list.ViewPagerTabs
android:id="@+id/lists_pager_header"
android:layout_width="match_parent"
diff --git a/res/layout/phone_favorites_fragment.xml b/res/layout/phone_favorites_fragment.xml
index 5e9e3bbb2..89a9f73bc 100644
--- a/res/layout/phone_favorites_fragment.xml
+++ b/res/layout/phone_favorites_fragment.xml
@@ -35,6 +35,7 @@
android:id="@+id/contact_tile_list"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:paddingTop="@dimen/favorites_row_top_padding"
android:numColumns="@integer/contact_tile_column_count_in_favorites"
android:clipToPadding="false"
android:fadingEdge="none"