summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorBrian Attwell <brianattwell@google.com>2014-09-05 22:24:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-09-05 22:24:11 +0000
commit8be85c826eb66dfd6f48b7fb79286f699d47e1cb (patch)
tree91dc46814442127b195a2216dcb2bd5d8af87d64 /res
parentf9b0e15310ddf6871b3354af322b97d3f26c44f1 (diff)
parent83f6f8dff13d2754290196bc6dd7f7b89c651014 (diff)
downloadandroid_packages_apps_Dialer-8be85c826eb66dfd6f48b7fb79286f699d47e1cb.tar.gz
android_packages_apps_Dialer-8be85c826eb66dfd6f48b7fb79286f699d47e1cb.tar.bz2
android_packages_apps_Dialer-8be85c826eb66dfd6f48b7fb79286f699d47e1cb.zip
Merge "Don't set the same viewId twice" into lmp-dev
Diffstat (limited to 'res')
-rw-r--r--res/layout/show_all_contacts_fragment.xml4
1 files changed, 1 insertions, 3 deletions
diff --git a/res/layout/show_all_contacts_fragment.xml b/res/layout/show_all_contacts_fragment.xml
index fe188bddd..00358dc47 100644
--- a/res/layout/show_all_contacts_fragment.xml
+++ b/res/layout/show_all_contacts_fragment.xml
@@ -24,9 +24,7 @@
<!-- Shown only when an Account filter is set.
- paddingTop should be here to show "shade" effect correctly. -->
<!-- TODO: Remove the filter header. -->
- <include
- android:id="@+id/account_filter_header_container"
- layout="@layout/account_filter_header" />
+ <include layout="@layout/account_filter_header" />
<FrameLayout
android:layout_width="match_parent"