am 25a7b6eb: Merge "Remove padding from call buttons to fix undesired cropping." into lmp-mr1-dev
* commit '25a7b6eb3c7116efb3d8ddebe7e002879be5f2fa':
Remove padding from call buttons to fix undesired cropping.
diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index 24101fe..e8feca6 100644
--- a/InCallUI/res/layout/call_button_fragment.xml
+++ b/InCallUI/res/layout/call_button_fragment.xml
@@ -45,8 +45,6 @@
android:orientation="horizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:paddingStart="@dimen/button_cluster_horizontal_padding"
- android:paddingEnd="@dimen/button_cluster_horizontal_padding"
android:gravity="bottom|center_horizontal"
android:baselineAligned="false">
diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml
index f390f38..43307e8 100644
--- a/InCallUI/res/values/dimens.xml
+++ b/InCallUI/res/values/dimens.xml
@@ -69,13 +69,6 @@
<dimen name="floating_action_bar_vertical_offset">-24dp</dimen>
- <!-- Padding at the left and right edges of the incall_touch_ui button
- cluster. This padding is necessary because we can't allow the
- buttons to be very close to the edges of the screen, due to the
- risk of false touches (from your finger wrapping around while
- holding the phone, *before* moving it up to your face and having
- the prox sensor kick in.) -->
- <dimen name="button_cluster_horizontal_padding">20dp</dimen>
<dimen name="call_button_margin_vertical">8dp</dimen>
<dimen name="call_button_margin_horizontal">6dp</dimen>