summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2015-01-20 18:49:39 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-01-20 18:49:39 +0000
commit25a7b6eb3c7116efb3d8ddebe7e002879be5f2fa (patch)
tree1a890dc1fa0d7cf5df9fe6ad4e44fcb5e103c553
parentfde1bf36bfe6e055d52fa596efeab2c4718cf1ed (diff)
parent978f6bff7580564911d66176ab669ead447c1913 (diff)
downloadpackages_apps_InCallUI-25a7b6eb3c7116efb3d8ddebe7e002879be5f2fa.tar.gz
packages_apps_InCallUI-25a7b6eb3c7116efb3d8ddebe7e002879be5f2fa.tar.bz2
packages_apps_InCallUI-25a7b6eb3c7116efb3d8ddebe7e002879be5f2fa.zip
Merge "Remove padding from call buttons to fix undesired cropping." into lmp-mr1-dev
-rw-r--r--res/layout/call_button_fragment.xml2
-rw-r--r--res/values/dimens.xml7
2 files changed, 0 insertions, 9 deletions
diff --git a/res/layout/call_button_fragment.xml b/res/layout/call_button_fragment.xml
index 24101fea..e8feca68 100644
--- a/res/layout/call_button_fragment.xml
+++ b/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/res/values/dimens.xml b/res/values/dimens.xml
index f390f38e..43307e8d 100644
--- a/res/values/dimens.xml
+++ b/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>