Add fancier press states for buttons.
- Add tint color, which applies 60% opacity in default state.
- Apply tint to dialer call buttons.
- Convert add, swap, and merge icons into drawables.
Bug: 14108639
Change-Id: Id9c08ccb035958e51d28255b8c13644c6c5fca73
diff --git a/InCallUI/res/drawable/btn_add.xml b/InCallUI/res/drawable/btn_add.xml
new file mode 100644
index 0000000..403fc1c
--- /dev/null
+++ b/InCallUI/res/drawable/btn_add.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ ~ Copyright (C) 2014 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/btn_background" />
+
+ <item>
+ <bitmap android:src="@drawable/ic_add_contact_holo_dark"
+ android:gravity="center"
+ android:tint="@color/selectable_icon_tint" />
+ </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/InCallUI/res/drawable/btn_background.xml b/InCallUI/res/drawable/btn_background.xml
new file mode 100644
index 0000000..be46446
--- /dev/null
+++ b/InCallUI/res/drawable/btn_background.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+ ~ Copyright (C) 2014 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:drawable="@color/tab_pressed_color" />
+ <item android:state_focused="true"
+ android:drawable="@drawable/tab_unselected_focused" />
+ <item android:drawable="@android:color/transparent" />
+
+</selector>
diff --git a/InCallUI/res/drawable/btn_compound_audio.xml b/InCallUI/res/drawable/btn_compound_audio.xml
index c348c98..51dc2c5 100644
--- a/InCallUI/res/drawable/btn_compound_audio.xml
+++ b/InCallUI/res/drawable/btn_compound_audio.xml
@@ -46,7 +46,8 @@
size of the button. -->
<item android:id="@+id/moreIndicatorItem">
<bitmap android:src="@drawable/ic_more_indicator_holo_dark"
- android:gravity="center" />
+ android:gravity="center"
+ android:tint="@color/selectable_icon_tint" />
</item>
<!-- Finally, the button icon.
@@ -70,26 +71,30 @@
<!-- Bluetooth is active -->
<item android:id="@+id/bluetoothItem">
<bitmap android:src="@drawable/ic_sound_bluetooth_holo_dark"
- android:gravity="center" />
+ android:gravity="center"
+ android:tint="@color/selectable_icon_tint" />
</item>
<!-- Handset earpiece is active -->
<item android:id="@+id/handsetItem">
<bitmap android:src="@drawable/ic_sound_handset_holo_dark"
- android:gravity="center" />
+ android:gravity="center"
+ android:tint="@color/selectable_icon_tint" />
</item>
<!-- Speakerphone icon showing 'speaker on' state -->
<item android:id="@+id/speakerphoneOnItem">
<bitmap android:src="@drawable/ic_sound_speakerphone_holo_dark"
- android:gravity="center" />
+ android:gravity="center"
+ android:tint="@color/selectable_icon_tint" />
</item>
<!-- Speakerphone icon showing 'speaker off' state -->
<item android:id="@+id/speakerphoneOffItem">
<bitmap android:src="@drawable/ic_sound_off_speakerphone_holo_dark"
- android:gravity="center" />
+ android:gravity="center"
+ android:tint="@color/selectable_icon_tint" />
</item>
<!-- Generic "audio mode" icon. Looks almost identical to
diff --git a/InCallUI/res/drawable/btn_compound_dialpad.xml b/InCallUI/res/drawable/btn_compound_dialpad.xml
index b44f2fa..19668af 100644
--- a/InCallUI/res/drawable/btn_compound_dialpad.xml
+++ b/InCallUI/res/drawable/btn_compound_dialpad.xml
@@ -24,7 +24,8 @@
the icon up to the full size of the button. -->
<item>
<bitmap android:src="@drawable/ic_dialpad_holo_dark"
- android:gravity="center" />
+ android:gravity="center"
+ android:tint="@color/selectable_icon_tint" />
</item>
</layer-list>
diff --git a/InCallUI/res/drawable/btn_compound_hold.xml b/InCallUI/res/drawable/btn_compound_hold.xml
index 50161ea..058db30 100644
--- a/InCallUI/res/drawable/btn_compound_hold.xml
+++ b/InCallUI/res/drawable/btn_compound_hold.xml
@@ -24,7 +24,8 @@
the icon up to the full size of the button. -->
<item>
<bitmap android:src="@drawable/ic_hold_pause_holo_dark"
- android:gravity="center" />
+ android:gravity="center"
+ android:tint="@color/selectable_icon_tint" />
</item>
</layer-list>
diff --git a/InCallUI/res/drawable/btn_compound_mute.xml b/InCallUI/res/drawable/btn_compound_mute.xml
index 4e09bd9..53608a1 100644
--- a/InCallUI/res/drawable/btn_compound_mute.xml
+++ b/InCallUI/res/drawable/btn_compound_mute.xml
@@ -24,7 +24,8 @@
the icon up to the full size of the button. -->
<item>
<bitmap android:src="@drawable/ic_mute_holo_dark"
- android:gravity="center" />
+ android:gravity="center"
+ android:tint="@color/selectable_icon_tint" />
</item>
</layer-list>
diff --git a/InCallUI/res/drawable/btn_merge.xml b/InCallUI/res/drawable/btn_merge.xml
new file mode 100644
index 0000000..080949a
--- /dev/null
+++ b/InCallUI/res/drawable/btn_merge.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ ~ Copyright (C) 2014 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/btn_background" />
+
+ <item>
+ <bitmap android:src="@drawable/ic_merge_holo_dark"
+ android:gravity="center"
+ android:tint="@color/selectable_icon_tint" />
+ </item>
+
+</layer-list>
\ No newline at end of file
diff --git a/InCallUI/res/drawable/btn_swap.xml b/InCallUI/res/drawable/btn_swap.xml
new file mode 100644
index 0000000..869b917
--- /dev/null
+++ b/InCallUI/res/drawable/btn_swap.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ ~ Copyright (C) 2014 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/btn_background" />
+
+ <item>
+ <bitmap android:src="@drawable/ic_incall_switch_holo_dark"
+ android:gravity="center"
+ android:tint="@color/selectable_icon_tint" />
+ </item>
+
+</layer-list>
\ No newline at end of file