summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Chen <ajchen@google.com>2016-10-24 16:05:44 -0700
committerAnthony Chen <ajchen@google.com>2016-10-24 16:05:44 -0700
commit3bc4727604aa6b8cc80f79df30236bc78c6abf2b (patch)
tree457796353f0388b0cfa7af749deacfdbb1fff1f7
parent3d724a4b70dd9a08d9adddc3b403edfd572bcaa6 (diff)
downloadDialer-3bc4727604aa6b8cc80f79df30236bc78c6abf2b.tar.gz
Fix bug where clicks on the dialer would fall through to the underlying
fragment. This occurs because the dialer fragment is added to the backstack instead of replacing. So, because the parent View of the dialer fragment is not clickable, clicks fall through to the first fragment. Test: Manually tested Bug: 32380459 Change-Id: Id1393a42550ef9316e32e59af136111045e89c7a
-rw-r--r--res/layout-h720dp/dialer_fragment.xml4
-rw-r--r--res/layout/dialer_fragment.xml3
2 files changed, 7 insertions, 0 deletions
diff --git a/res/layout-h720dp/dialer_fragment.xml b/res/layout-h720dp/dialer_fragment.xml
index bd810a5a..e0980994 100644
--- a/res/layout-h720dp/dialer_fragment.xml
+++ b/res/layout-h720dp/dialer_fragment.xml
@@ -21,10 +21,14 @@
xmlns:card_view="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent">
+
+ <!-- This CardView is clickable so that clicks do not fall through to the fragment that
+ is underneath the dialer_fragment. -->
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="@dimen/lens_header_height"
+ android:clickable="true"
card_view:cardBackgroundColor="@color/car_card"
card_view:cardElevation="@dimen/dialer_card_elevation">
diff --git a/res/layout/dialer_fragment.xml b/res/layout/dialer_fragment.xml
index 1cacbbee..c3c432f8 100644
--- a/res/layout/dialer_fragment.xml
+++ b/res/layout/dialer_fragment.xml
@@ -22,8 +22,11 @@
android:layout_height="match_parent"
android:paddingTop="@dimen/lens_header_height">
+ <!-- This LinearLayout is clickable so that clicks do not fall through to the fragment that
+ is underneath the dialer_fragment. -->
<LinearLayout
android:background="@color/car_card"
+ android:clickable="true"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingTop="@dimen/dial_container_vertical_margin"