diff options
| author | Evan Charlton <evanc@google.com> | 2014-05-15 16:02:21 -0700 |
|---|---|---|
| committer | Evan Charlton <evanc@google.com> | 2014-05-15 16:22:56 -0700 |
| commit | 8aac1a358f2caf6c21c603bae9c9d4bd075eb155 (patch) | |
| tree | 3baa868a0552d36d8d74bdaf2e1a5cfddd2212a1 /InCallUI/res/values | |
| parent | 8ef5cf3987ab9f7988d0ce7b033270095e05481d (diff) | |
| parent | c8caa6b8ca6fbfe58f5f61160f7b08b1f00be025 (diff) | |
Merge remote-tracking branch 'goog/master-nova' into merge
Conflicts:
res/layout/call_card.xml
res/values-da/strings.xml
res/values-hi/strings.xml
src/com/android/incallui/CallButtonPresenter.java
src/com/android/incallui/CallCardFragment.java
src/com/android/incallui/CallCardPresenter.java
src/com/android/incallui/DialpadFragment.java
Change-Id: I6b3a2b063a2efd76330d4833cd95be3132f01462
Diffstat (limited to 'InCallUI/res/values')
| -rw-r--r-- | InCallUI/res/values/colors.xml | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/InCallUI/res/values/colors.xml b/InCallUI/res/values/colors.xml index c1e894a86..74c218e34 100644 --- a/InCallUI/res/values/colors.xml +++ b/InCallUI/res/values/colors.xml @@ -39,6 +39,18 @@ <color name="end_call_touch_feedback_tint">#dddddd</color> + <!-- Used when the Handoff Call button is active --> + <color name="handoff_call_active_color">#F2882C</color> + + <!-- Used when the Handoff Call button is pressed --> + <color name="handoff_call_pressed_color">#F2A35E</color> + + <!-- Used when the Handoff Call button is disabled --> + <color name="handoff_call_disabled_color">#303030</color> + + <color name="call_state_wifi">#19E392</color> + <color name="call_state_cellular">#33A9F2</color> + <!-- Color of dialpad digits --> <color name="dialpad_digits_text_color">#000000</color> @@ -52,8 +64,6 @@ <!-- 25% opacity, white. --> <color name="button_disabled_color">#40ffffff</color> - <color name="wifi_connected_background">#8099cc00</color> - <!-- Background color of action bars --> <color name="actionbar_background_color">#3B77E7</color> |