diff options
Diffstat (limited to 'res/drawable')
-rw-r--r-- | res/drawable/btn_add.xml | 5 | ||||
-rw-r--r-- | res/drawable/btn_change_to_video.xml | 3 | ||||
-rw-r--r-- | res/drawable/btn_change_to_voice.xml | 3 | ||||
-rw-r--r-- | res/drawable/btn_compound_audio.xml | 9 | ||||
-rw-r--r-- | res/drawable/btn_compound_background.xml | 4 | ||||
-rw-r--r-- | res/drawable/btn_compound_dialpad.xml | 3 | ||||
-rw-r--r-- | res/drawable/btn_compound_hold.xml | 3 | ||||
-rw-r--r-- | res/drawable/btn_compound_mute.xml | 3 | ||||
-rw-r--r-- | res/drawable/btn_compound_video_off.xml | 3 | ||||
-rw-r--r-- | res/drawable/btn_compound_video_switch.xml | 3 | ||||
-rw-r--r-- | res/drawable/btn_merge.xml | 3 | ||||
-rw-r--r-- | res/drawable/btn_overflow.xml | 3 | ||||
-rw-r--r-- | res/drawable/btn_swap.xml | 3 | ||||
-rw-r--r-- | res/drawable/conference_ripple.xml | 25 | ||||
-rw-r--r-- | res/drawable/img_conference_automirrored.xml | 21 |
15 files changed, 71 insertions, 23 deletions
diff --git a/res/drawable/btn_add.xml b/res/drawable/btn_add.xml index 515d65b0..7d5e90f7 100644 --- a/res/drawable/btn_add.xml +++ b/res/drawable/btn_add.xml @@ -18,12 +18,13 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/btn_background" /> + <item android:id="@+id/backgroundItem" + android:drawable="@drawable/btn_background" /> <item> <bitmap android:src="@drawable/ic_toolbar_add_call" android:gravity="center" android:tint="@color/selectable_icon_tint" /> </item> - + </layer-list>
\ No newline at end of file diff --git a/res/drawable/btn_change_to_video.xml b/res/drawable/btn_change_to_video.xml index 962539e4..a26cee3e 100644 --- a/res/drawable/btn_change_to_video.xml +++ b/res/drawable/btn_change_to_video.xml @@ -18,7 +18,8 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/btn_background" /> + <item android:id="@+id/backgroundItem" + android:drawable="@drawable/btn_background" /> <item> <bitmap android:src="@drawable/ic_toolbar_video" diff --git a/res/drawable/btn_change_to_voice.xml b/res/drawable/btn_change_to_voice.xml index fdeae071..86a7f21d 100644 --- a/res/drawable/btn_change_to_voice.xml +++ b/res/drawable/btn_change_to_voice.xml @@ -18,7 +18,8 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/btn_background" /> + <item android:id="@+id/backgroundItem" + android:drawable="@drawable/btn_background" /> <item> <bitmap android:src="@drawable/ic_toolbar_audio_phone" diff --git a/res/drawable/btn_compound_audio.xml b/res/drawable/btn_compound_audio.xml index 222ff1b4..25a64a6a 100644 --- a/res/drawable/btn_compound_audio.xml +++ b/res/drawable/btn_compound_audio.xml @@ -90,13 +90,4 @@ android:tint="@color/selectable_icon_tint" /> </item> - <!-- Generic "audio mode" icon. --> - <!-- TODO: is this actually needed? --> - <!-- - <item android:id="@+id/soundItem"> - <bitmap android:src="@drawable/ic_sound_holo_dark" - android:gravity="center" /> - </item> - --> - </layer-list> diff --git a/res/drawable/btn_compound_background.xml b/res/drawable/btn_compound_background.xml index 93e6c311..20e2a305 100644 --- a/res/drawable/btn_compound_background.xml +++ b/res/drawable/btn_compound_background.xml @@ -24,7 +24,7 @@ android:drawable="@drawable/btn_selected_focused" /> <item android:state_focused="true" - android:drawable="@drawable/btn_unselected_focused" />cd + android:drawable="@drawable/btn_unselected_focused" /> <item android:state_selected="true" android:drawable="@drawable/btn_selected" /> @@ -32,4 +32,4 @@ <item android:drawable="@drawable/btn_unselected" /> </selector> </item> -</ripple>
\ No newline at end of file +</ripple> diff --git a/res/drawable/btn_compound_dialpad.xml b/res/drawable/btn_compound_dialpad.xml index fcd9a3c0..1b78ead4 100644 --- a/res/drawable/btn_compound_dialpad.xml +++ b/res/drawable/btn_compound_dialpad.xml @@ -18,7 +18,8 @@ <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:id="@+id/compoundBackgroundItem" + android:drawable="@drawable/btn_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/res/drawable/btn_compound_hold.xml b/res/drawable/btn_compound_hold.xml index dcf95073..7974efae 100644 --- a/res/drawable/btn_compound_hold.xml +++ b/res/drawable/btn_compound_hold.xml @@ -18,7 +18,8 @@ <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:id="@+id/compoundBackgroundItem" + android:drawable="@drawable/btn_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/res/drawable/btn_compound_mute.xml b/res/drawable/btn_compound_mute.xml index 68a8c9b3..86708fb0 100644 --- a/res/drawable/btn_compound_mute.xml +++ b/res/drawable/btn_compound_mute.xml @@ -18,7 +18,8 @@ <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:id="@+id/compoundBackgroundItem" + android:drawable="@drawable/btn_compound_background" /> <!-- Use an explicit <bitmap> to avoid scaling the icon up to the full size of the button. --> <item> diff --git a/res/drawable/btn_compound_video_off.xml b/res/drawable/btn_compound_video_off.xml index 8af4209d..b942cd0c 100644 --- a/res/drawable/btn_compound_video_off.xml +++ b/res/drawable/btn_compound_video_off.xml @@ -19,7 +19,8 @@ <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:id="@+id/compoundBackgroundItem" + android:drawable="@drawable/btn_compound_background" /> <!-- Use an explicit <bitmap> to avoid scaling the icon up to the full size of the button. --> <item> diff --git a/res/drawable/btn_compound_video_switch.xml b/res/drawable/btn_compound_video_switch.xml index ef171ab9..f8111866 100644 --- a/res/drawable/btn_compound_video_switch.xml +++ b/res/drawable/btn_compound_video_switch.xml @@ -19,7 +19,8 @@ <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:id="@+id/compoundBackgroundItem" + android:drawable="@drawable/btn_compound_background" /> <!-- Use an explicit <bitmap> to avoid scaling the icon up to the full size of the button. --> <item> diff --git a/res/drawable/btn_merge.xml b/res/drawable/btn_merge.xml index 78e19749..2b4818a4 100644 --- a/res/drawable/btn_merge.xml +++ b/res/drawable/btn_merge.xml @@ -18,7 +18,8 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/btn_background" /> + <item android:id="@+id/backgroundItem" + android:drawable="@drawable/btn_background" /> <item> <bitmap android:src="@drawable/ic_toolbar_merge" diff --git a/res/drawable/btn_overflow.xml b/res/drawable/btn_overflow.xml index e851eceb..2eb26cc1 100644 --- a/res/drawable/btn_overflow.xml +++ b/res/drawable/btn_overflow.xml @@ -18,7 +18,8 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/btn_background" /> + <item android:id="@+id/backgroundItem" + android:drawable="@drawable/btn_background" /> <item> <bitmap android:src="@drawable/ic_overflow_menu" diff --git a/res/drawable/btn_swap.xml b/res/drawable/btn_swap.xml index 7a824112..5d6c8eca 100644 --- a/res/drawable/btn_swap.xml +++ b/res/drawable/btn_swap.xml @@ -18,7 +18,8 @@ <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:drawable="@drawable/btn_background" /> + <item android:id="@+id/backgroundItem" + android:drawable="@drawable/btn_background" /> <item> <bitmap android:src="@drawable/ic_toolbar_swap" diff --git a/res/drawable/conference_ripple.xml b/res/drawable/conference_ripple.xml new file mode 100644 index 00000000..4e4a2130 --- /dev/null +++ b/res/drawable/conference_ripple.xml @@ -0,0 +1,25 @@ +<!-- + ~ 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 + --> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="@color/ripple_light"> + <!-- Constrain the ripple to a rectangular area --> + <item> + <shape android:shape="rectangle"> + <solid android:color="@color/background_dialer_white" /> + </shape> + </item> +</ripple>
\ No newline at end of file diff --git a/res/drawable/img_conference_automirrored.xml b/res/drawable/img_conference_automirrored.xml new file mode 100644 index 00000000..fa1fd492 --- /dev/null +++ b/res/drawable/img_conference_automirrored.xml @@ -0,0 +1,21 @@ +<?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 + --> + +<bitmap xmlns:android="http://schemas.android.com/apk/res/android" + android:src="@drawable/img_conference" + android:autoMirrored="true" />
\ No newline at end of file |