diff options
author | Christine Chen <christinech@google.com> | 2013-10-14 14:58:13 -0700 |
---|---|---|
committer | Christine Chen <christinech@google.com> | 2013-10-14 14:58:13 -0700 |
commit | 54b90dcbf4c488f4f818b8c37a3b1277e7790d9e (patch) | |
tree | 41327d1b686342a235d4c28bfc20287afb1903a6 /InCallUI/res/drawable | |
parent | 6fce81bb26123e502ffb11c4e0236336163d4edd (diff) |
Replaces ToggleButtons with ImageButtons
- Defer setting the toggled/selected state until TeleService gets back to us.
Bug: 11172457
Change-Id: I4d103c1288b6e730c61aaf49e679f6b58746897b
Diffstat (limited to 'InCallUI/res/drawable')
-rw-r--r-- | InCallUI/res/drawable/btn_compound_audio.xml | 2 | ||||
-rw-r--r-- | InCallUI/res/drawable/btn_fake_compound_background.xml | 36 | ||||
-rw-r--r-- | InCallUI/res/drawable/btn_fake_compound_hold.xml (renamed from InCallUI/res/drawable/btn_compound_hold.xml) | 2 | ||||
-rw-r--r-- | InCallUI/res/drawable/btn_fake_compound_mute.xml (renamed from InCallUI/res/drawable/btn_compound_mute.xml) | 2 | ||||
-rw-r--r-- | InCallUI/res/drawable/list_selector_selected_and_pressed.xml | 20 |
5 files changed, 59 insertions, 3 deletions
diff --git a/InCallUI/res/drawable/btn_compound_audio.xml b/InCallUI/res/drawable/btn_compound_audio.xml index c348c98c1..5d364942d 100644 --- a/InCallUI/res/drawable/btn_compound_audio.xml +++ b/InCallUI/res/drawable/btn_compound_audio.xml @@ -37,7 +37,7 @@ (In states where the audio button *not* a toggle, we explicitly hide this layer.) --> <item android:id="@+id/compoundBackgroundItem" - android:drawable="@drawable/btn_compound_background" /> + android:drawable="@drawable/btn_fake_compound_background" /> <!-- The little triangle that indicates that this isn't a plain button, but will instead pop up a menu. This layer is *not* diff --git a/InCallUI/res/drawable/btn_fake_compound_background.xml b/InCallUI/res/drawable/btn_fake_compound_background.xml new file mode 100644 index 000000000..197f589d1 --- /dev/null +++ b/InCallUI/res/drawable/btn_fake_compound_background.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> + +<!-- Background resource for "compound buttons" in the in-call UI. + These buttons have two states (checked and unchecked), and + show a blue bar along the bottom edge when checked. --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> + + <item android:state_pressed="true" android:state_selected="true" + android:drawable="@drawable/list_selector_selected_and_pressed" /> + <item android:state_pressed="true" + android:drawable="@drawable/list_pressed_holo_dark" /> + <item android:state_selected="true" android:state_focused="true" + android:drawable="@drawable/list_selector_focused_and_checked" /> + <item android:state_focused="true" + android:drawable="@drawable/list_focused_holo" /> + <item android:state_selected="true" + android:drawable="@drawable/ic_active_state_dialer_holo_dark" /> + + <item + android:drawable="@android:color/transparent" /> + +</selector>
\ No newline at end of file diff --git a/InCallUI/res/drawable/btn_compound_hold.xml b/InCallUI/res/drawable/btn_fake_compound_hold.xml index 50161eac8..04bdd9441 100644 --- a/InCallUI/res/drawable/btn_compound_hold.xml +++ b/InCallUI/res/drawable/btn_fake_compound_hold.xml @@ -18,7 +18,7 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <!-- The standard "compound button" background. --> - <item android:drawable="@drawable/btn_compound_background" /> + <item android:drawable="@drawable/btn_fake_compound_background" /> <!-- ...and the actual icon on top. Use an explicit <bitmap> to avoid scaling the icon up to the full size of the button. --> diff --git a/InCallUI/res/drawable/btn_compound_mute.xml b/InCallUI/res/drawable/btn_fake_compound_mute.xml index 4e09bd9c3..69048a27f 100644 --- a/InCallUI/res/drawable/btn_compound_mute.xml +++ b/InCallUI/res/drawable/btn_fake_compound_mute.xml @@ -18,7 +18,7 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> <!-- The standard "compound button" background. --> - <item android:drawable="@drawable/btn_compound_background" /> + <item android:drawable="@drawable/btn_fake_compound_background" /> <!-- ...and the actual icon on top. Use an explicit <bitmap> to avoid scaling the icon up to the full size of the button. --> diff --git a/InCallUI/res/drawable/list_selector_selected_and_pressed.xml b/InCallUI/res/drawable/list_selector_selected_and_pressed.xml new file mode 100644 index 000000000..d81ee36ea --- /dev/null +++ b/InCallUI/res/drawable/list_selector_selected_and_pressed.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 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. +--> + +<layer-list xmlns:android="http://schemas.android.com/apk/res/android" > + <item android:drawable="@drawable/ic_active_state_dialer_holo_dark" /> + <item android:drawable="@drawable/list_pressed_holo_dark" /> +</layer-list>
\ No newline at end of file |