diff options
author | Andrew Lee <anwlee@google.com> | 2014-05-07 11:29:41 -0700 |
---|---|---|
committer | Andrew Lee <anwlee@google.com> | 2014-05-07 12:30:43 -0700 |
commit | 70bab107dc2016d5e95d9a09c8479b7ce690ff80 (patch) | |
tree | d9e21a9fac63f80c1a0b86456f76f6457ddfb1ce /InCallUI/res/values | |
parent | d354f99d0861dfc3909f5a4b407536a248490b39 (diff) |
Change selected/unselected states of buttons.
- Add touch feedback (w00t).
- Adjust button heights/positions to spec.
- Add drawables for the different button states (no longer tabs).
- Remove vertical spacers (interfered with touch feedback).
Change-Id: I383ca898c8d2fcfc8c34021efc62cb03adbde1c1
Diffstat (limited to 'InCallUI/res/values')
-rw-r--r-- | InCallUI/res/values/colors.xml | 2 | ||||
-rw-r--r-- | InCallUI/res/values/dimens.xml | 6 | ||||
-rw-r--r-- | InCallUI/res/values/styles.xml | 7 |
3 files changed, 7 insertions, 8 deletions
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index d8e789151..8d48759b0 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -55,6 +55,8 @@ <!-- Button background color. --> <color name="button_background_color">@color/incall_background_color</color> + <color name="button_selected_color">#00acc1</color> + <!-- Background color of action bars --> <color name="actionbar_background_color">#3B77E7</color> diff --git a/InCallUI/res/values/dimens.xml b/InCallUI/res/values/dimens.xml index ae5f5a1dd..b428179c4 100644 --- a/InCallUI/res/values/dimens.xml +++ b/InCallUI/res/values/dimens.xml @@ -48,7 +48,7 @@ <dimen name="call_banner_name_number_right_padding">50sp</dimen> <!-- Height of the main row of in-call buttons. --> - <dimen name="in_call_button_height">76dp</dimen> + <dimen name="in_call_button_height">48dp</dimen> <!-- Width of buttons in the extra button row. --> <dimen name="extra_row_button_width">56dp</dimen> @@ -65,7 +65,9 @@ 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_side_padding">20dp</dimen> + <dimen name="button_cluster_horizontal_padding">20dp</dimen> + <dimen name="button_cluster_vertical_padding">4dp</dimen> + <dimen name="call_button_margin">4dp</dimen> <!-- Dimensions for OTA Call Card --> <dimen name="otaactivate_layout_marginTop">10dp</dimen> diff --git a/InCallUI/res/values/styles.xml b/InCallUI/res/values/styles.xml index b0f25ec51..47151467b 100644 --- a/InCallUI/res/values/styles.xml +++ b/InCallUI/res/values/styles.xml @@ -54,6 +54,7 @@ <style name="InCallButton"> <item name="android:layout_width">0px</item> <item name="android:layout_height">@dimen/in_call_button_height</item> + <item name="android:layout_margin">@dimen/call_button_margin</item> <item name="android:layout_weight">1</item> <item name="android:background">?android:attr/selectableItemBackground</item> </style> @@ -68,12 +69,6 @@ <item name="android:textOff">@null</item> </style> - <style name="VerticalSeparator"> - <item name="android:layout_width">2dp</item> - <item name="android:layout_height">match_parent</item> - <item name="android:background">@color/button_background_color</item> - </style> - <!-- Buttons in extra button row. --> <style name="InCallExtraRowButton"> <item name="android:layout_width">@dimen/extra_row_button_width</item> |