diff options
author | Nancy Chen <nancychen@google.com> | 2014-11-21 22:33:06 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-11-21 22:33:06 +0000 |
commit | 1132abd463eb06f3bb248ee73ee35b5a4adae790 (patch) | |
tree | 779e41c192dd80f1bd9ae82cde2a69ccff806ade /InCallUI | |
parent | 1554e6b49517fb0268a34cebc420ee800b3c9c78 (diff) | |
parent | 4fde929f4d0e3ecc994a60e3cb9596ba3983e8b5 (diff) |
am 03a8e82e: am 35597bcb: am 5cc71584: Merge "Resize InCallUI for small devices." into lmp-mr1-dev
* commit '03a8e82ec3442dffe75604d691a71cdae4e22e7a':
Resize InCallUI for small devices.
Diffstat (limited to 'InCallUI')
-rw-r--r-- | InCallUI/res/values-sw360dp/dimens.xml | 37 | ||||
-rw-r--r-- | InCallUI/res/values/dimens.xml | 29 |
2 files changed, 58 insertions, 8 deletions
diff --git a/InCallUI/res/values-sw360dp/dimens.xml b/InCallUI/res/values-sw360dp/dimens.xml new file mode 100644 index 000000000..58c81bb95 --- /dev/null +++ b/InCallUI/res/values-sw360dp/dimens.xml @@ -0,0 +1,37 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2013 The Android Open Source Project + ~ + ~ Licensed under the Apache License, Version 2.0 (the "License"); + ~ you may not use this file except in compliance with the License. + ~ You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License + --> + +<resources> + <!-- Dimensions for CallCard elements (the normal in-call UI) --> + + <!-- Height of the "call banner" overlay on top of the upper part of + the call info area. --> + <dimen name="call_banner_height">122dp</dimen> + <!-- Text size for the name in the call info. --> + <dimen name="call_status_text_size">22sp</dimen> + <dimen name="call_name_text_size">45dp</dimen> + <dimen name="call_name_text_min_size">34sp</dimen> + <dimen name="call_label_text_size">18sp</dimen> + + <!-- The InCallUI dialpad will sometimes want digits sizes that are different from dialer. --> + <dimen name="dialpad_key_number_margin_bottom">@dimen/dialpad_key_number_default_margin_bottom</dimen> + <!-- Zero key should have less space between self and text because "+" is smaller --> + <dimen name="dialpad_zero_key_number_margin_bottom">@dimen/dialpad_zero_key_number_default_margin_bottom</dimen> + <dimen name="dialpad_digits_adjustable_text_size">@dimen/dialpad_digits_text_size</dimen> + <dimen name="dialpad_digits_adjustable_height">@dimen/dialpad_digits_height</dimen> + <dimen name="dialpad_key_numbers_size">@dimen/dialpad_key_numbers_default_size</dimen> +</resources>
\ No newline at end of file diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml index ee8ecefe1..f390f38ec 100644 --- a/InCallUI/res/values/dimens.xml +++ b/InCallUI/res/values/dimens.xml @@ -18,9 +18,10 @@ <resources> <!-- Dimensions for CallCard elements (the normal in-call UI) --> - <!-- Height of the "call banner" overlay on top of the upper part of - the call info area. --> - <dimen name="call_banner_height">122dp</dimen> + <!-- Height of the "call banner" overlay on top of the upper part of the call info area. + Note: This is the default size for small (<600dp height) devices: larger screen sizes apply + the values in values-h600dp/dimens.xml. --> + <dimen name="call_banner_height">90dp</dimen> <dimen name="incall_action_bar_elevation">3dp</dimen> <!-- Margin between the bottom of the "call card" photo @@ -38,11 +39,13 @@ <!-- Padding at the top and bottom edges of the "provider information" --> <dimen name="provider_info_top_bottom_padding">8dp</dimen> - <!-- Text size for the name in the call info. --> - <dimen name="call_status_text_size">22sp</dimen> - <dimen name="call_name_text_size">45dp</dimen> - <dimen name="call_name_text_min_size">34sp</dimen> - <dimen name="call_label_text_size">18sp</dimen> + <!-- Text sizes for information in the call card. + Note: These are the default sizes for small (<600dp height) devices: larger screen sizes + apply the values in values-h600dp/dimens.xml. --> + <dimen name="call_status_text_size">16sp</dimen> + <dimen name="call_name_text_size">34dp</dimen> + <dimen name="call_name_text_min_size">28sp</dimen> + <dimen name="call_label_text_size">16sp</dimen> <!-- Right padding for name and number fields in the call banner. This padding is used to ensure that ultra-long names or numbers won't overlap the elapsed time indication. --> @@ -54,6 +57,16 @@ <dimen name="primary_call_elevation">5dp</dimen> <dimen name="dialpad_elevation">2dp</dimen> + <!-- The InCallUI dialpad will sometimes want digits sizes that are different from dialer. + Note: These are the default sizes for small (<600dp height) devices: larger screen sizes + apply the values in values-h600dp/dimens.xml. --> + <dimen name="dialpad_key_number_margin_bottom">1dp</dimen> + <!-- Zero key should have less space between self and text because "+" is smaller --> + <dimen name="dialpad_zero_key_number_margin_bottom">0dp</dimen> + <dimen name="dialpad_digits_adjustable_text_size">20sp</dimen> + <dimen name="dialpad_digits_adjustable_height">50dp</dimen> + <dimen name="dialpad_key_numbers_size">36dp</dimen> + <dimen name="floating_action_bar_vertical_offset">-24dp</dimen> <!-- Padding at the left and right edges of the incall_touch_ui button |