diff options
author | Nancy Chen <nancychen@google.com> | 2015-01-20 18:57:23 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-01-20 18:57:23 +0000 |
commit | da741db02b8f8f0bde252729bf6c72e7f3d9c500 (patch) | |
tree | b6b7af26aa701e1557e95d58d308537e6f5f86f6 | |
parent | 8c3a52ea2028f76b8a2acc11d02bca0f8efb3527 (diff) | |
parent | 15110c789df7c1095b9586dff2d04806b10cfae3 (diff) |
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.
-rw-r--r-- | InCallUI/res/layout/call_button_fragment.xml | 2 | ||||
-rw-r--r-- | InCallUI/res/values/dimens.xml | 7 |
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> |