summaryrefslogtreecommitdiff
path: root/InCallUI
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-11-11 23:17:15 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-11-11 23:17:16 +0000
commit675ae91485cafb42d68f6a78af1fab54912ad48c (patch)
tree4610f291dfcc8dc5abf78b55e7bb19c00b8d2d7e /InCallUI
parent0f87a7196e37dda300b23bf8a02b3a238818d562 (diff)
parentbe8610659983bfe041c87e607900c6283c4a1a93 (diff)
Merge "Don't let touches in ConferenceManagerFragment fall through" into lmp-mr1-dev
Diffstat (limited to 'InCallUI')
-rw-r--r--InCallUI/res/layout/conference_manager_fragment.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/InCallUI/res/layout/conference_manager_fragment.xml b/InCallUI/res/layout/conference_manager_fragment.xml
index 9aa172ea7..5aed520b7 100644
--- a/InCallUI/res/layout/conference_manager_fragment.xml
+++ b/InCallUI/res/layout/conference_manager_fragment.xml
@@ -23,6 +23,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="@dimen/conference_call_manager_padding_top"
+ android:clickable="true"
android:visibility="gone">
<!-- List of conference participants. -->