diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-09 15:39:52 -0700 |
|---|---|---|
| committer | Andrew Lee <anwlee@google.com> | 2014-05-09 15:39:52 -0700 |
| commit | ff8200e38955212da5fa20a7d3b28eece5a34073 (patch) | |
| tree | 6e1bb7e4322d04e17954efa59c1efbf2866e3d0f /InCallUI/res/drawable | |
| parent | f62fe2b612e643f2ceef67a5cb5693feaa1376e9 (diff) | |
| parent | 56021c74461fef9783cfc853afdac96e7b7a3bdf (diff) | |
resolved conflicts for merge of d5557cb1 to master-nova
Change-Id: I6c9d594781d9d8de830104b1e038d381aacbc969
Diffstat (limited to 'InCallUI/res/drawable')
| -rw-r--r-- | InCallUI/res/drawable/floating_end_button_compound_background.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/InCallUI/res/drawable/floating_end_button_compound_background.xml b/InCallUI/res/drawable/floating_end_button_compound_background.xml index 2f2ad7921..433545b84 100644 --- a/InCallUI/res/drawable/floating_end_button_compound_background.xml +++ b/InCallUI/res/drawable/floating_end_button_compound_background.xml @@ -20,5 +20,5 @@ android:drawable="@drawable/floating_end_button_disabled_background" /> <item android:state_pressed="true" android:drawable="@drawable/floating_end_button_pressed_background" /> - <item android:drawable="@drawable/floating_end_button_active_background" /> + <item android:drawable="@drawable/fab_red_background" /> </selector> |