diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-02 21:21:21 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-02 21:21:21 +0000 |
| commit | cd8b8a40a01516e7c9a495e76919244030c4d06d (patch) | |
| tree | 8405a17eb670e712c7e6c2f113ca9ace7e17c18a /InCallUI/res/values | |
| parent | 2e657c63dec623700b9e156f4876a516f1005df4 (diff) | |
| parent | ff1621858276c5348655f3531d15b02cb13f60eb (diff) | |
am de956513: Styling polish to InCallUI.
* commit 'de956513f9db9ff52a8c2d85f3bdddeb4cfcf845':
Styling polish to InCallUI.
Diffstat (limited to 'InCallUI/res/values')
| -rw-r--r-- | InCallUI/res/values/colors.xml | 8 | ||||
| -rw-r--r-- | InCallUI/res/values/dimens.xml | 6 | ||||
| -rw-r--r-- | InCallUI/res/values/styles.xml | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index 420ba4b11..38b52a10e 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -48,11 +48,8 @@ <!-- Color of dialpad digits --> <color name="dialpad_digits_text_color">#000000</color> - <!-- Background color of dialpad --> - <color name="background_dialpad">#ffffff</color> - - <!-- Pressed color of dialpad buttons --> - <color name="background_dialpad_pressed">#ececec</color> + <color name="incall_dialpad_background">#ccffffff</color> + <color name="incall_dialpad_background_pressed">#33ffffff</color> <!-- Button background color. --> <color name="button_background_color">@color/incall_background_color</color> @@ -65,6 +62,5 @@ <!-- Secondary color of dialpad text (used for the letters corresponding to each digit --> <color name="dialpad_secondary_text_color">#8b8b8b</color> - <!-- Translucent shadow color --> <color name="translucent_shadow">#33999999</color> </resources> diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml index e9dd26bc9..ae5f5a1dd 100644 --- a/InCallUI/res/values/dimens.xml +++ b/InCallUI/res/values/dimens.xml @@ -56,6 +56,9 @@ <!-- Height of buttons in the extra button row. --> <dimen name="extra_row_button_height">@dimen/in_call_button_height</dimen> + <dimen name="primary_call_translation_z">8dp</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 @@ -64,7 +67,6 @@ the prox sensor kick in.) --> <dimen name="button_cluster_side_padding">20dp</dimen> - <!-- Dimensions for OTA Call Card --> <dimen name="otaactivate_layout_marginTop">10dp</dimen> <dimen name="otalistenprogress_layout_marginTop">5dp</dimen> @@ -135,4 +137,6 @@ <!-- Height of translucent shadow effect --> <dimen name="translucent_shadow_height">2dp</dimen> + + <dimen name="end_call_button_margin_bottom">15dp</dimen> </resources> diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml index 7b47d6703..1af591963 100644 --- a/InCallUI/res/values/styles.xml +++ b/InCallUI/res/values/styles.xml @@ -161,7 +161,7 @@ <item name="android:clickable">true</item> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">@dimen/dialpad_key_height</item> - <item name="android:background">@drawable/dialpad_key_colors</item> + <item name="android:background">@drawable/incall_dialpad_key_colors</item> <item name="android:focusable">true</item> </style> |