diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2016-10-25 00:59:06 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-10-25 00:59:06 +0000 |
| commit | 7769221ffa38608eb6d64301e188083aff20ece0 (patch) | |
| tree | 4c6d200d733c62b5967a13d9749af175bf9b98b2 | |
| parent | 1b11128bc5e45144664633996d785b57419683e9 (diff) | |
| parent | 3bc4727604aa6b8cc80f79df30236bc78c6abf2b (diff) | |
| download | platform_packages_apps_Car_Dialer-7769221ffa38608eb6d64301e188083aff20ece0.tar.gz platform_packages_apps_Car_Dialer-7769221ffa38608eb6d64301e188083aff20ece0.tar.bz2 platform_packages_apps_Car_Dialer-7769221ffa38608eb6d64301e188083aff20ece0.zip | |
Merge "Fix bug where clicks on the dialer would fall through to the underlying fragment."
| -rw-r--r-- | res/layout-h720dp/dialer_fragment.xml | 4 | ||||
| -rw-r--r-- | res/layout/dialer_fragment.xml | 3 |
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" |