summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNancy Chen <nancychen@google.com>2015-01-20 23:37:17 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2015-01-20 23:37:17 +0000
commit917ff5c7a73212e9b34626636de5fc6f6f44612e (patch)
treedde343e3967de6b4db753d9e3d0560568d4af6a8
parentc1857a261eb8e0bea7343358adaaac5bf986599d (diff)
parenta58d28489304b289cbc01a1242faa6415d224336 (diff)
am 21ed7890: am df4ae400: am 25a7b6eb: Merge "Remove padding from call buttons to fix undesired cropping." into lmp-mr1-dev
* commit '21ed7890c005452705d544ff9f004d553742dc89': Remove padding from call buttons to fix undesired cropping.
-rw-r--r--InCallUI/res/layout/call_button_fragment.xml2
-rw-r--r--InCallUI/res/values/dimens.xml7
2 files changed, 0 insertions, 9 deletions
diff --git a/InCallUI/res/layout/call_button_fragment.xml b/InCallUI/res/layout/call_button_fragment.xml
index 24101feac..e8feca68a 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 f390f38ec..43307e8db 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>