diff options
author | Yorke Lee <yorkelee@google.com> | 2014-08-11 16:50:51 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-08-11 16:50:51 +0000 |
commit | 3e358f4332188d65bda57a7650f8dd6ba62690b1 (patch) | |
tree | 468a59fa0a2ec3f6fd47e232eaa1a8082a3c6e46 | |
parent | 8e8c90e8052dea5d14a312aa8ee877f883dfca21 (diff) | |
parent | 4b9e53dc06e9e319ae73a341d37e21d14eb79bc7 (diff) |
am 4b9e53dc: am e03b6192: am a752bbdb: Replace voicemail seekbar playback asset
* commit '4b9e53dc06e9e319ae73a341d37e21d14eb79bc7':
Replace voicemail seekbar playback asset
-rw-r--r-- | res/drawable-hdpi/ic_handle.png | bin | 0 -> 543 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_handle.png | bin | 0 -> 454 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_handle.png | bin | 0 -> 681 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_handle.png | bin | 0 -> 1431 bytes | |||
-rw-r--r-- | res/drawable/ic_voicemail_seek_handle.xml | 21 | ||||
-rw-r--r-- | res/drawable/seek_bar_thumb.xml | 55 | ||||
-rw-r--r-- | res/layout/playback_layout.xml | 2 |
7 files changed, 22 insertions, 56 deletions
diff --git a/res/drawable-hdpi/ic_handle.png b/res/drawable-hdpi/ic_handle.png Binary files differnew file mode 100644 index 000000000..34310aa49 --- /dev/null +++ b/res/drawable-hdpi/ic_handle.png diff --git a/res/drawable-mdpi/ic_handle.png b/res/drawable-mdpi/ic_handle.png Binary files differnew file mode 100644 index 000000000..81a67ba6f --- /dev/null +++ b/res/drawable-mdpi/ic_handle.png diff --git a/res/drawable-xhdpi/ic_handle.png b/res/drawable-xhdpi/ic_handle.png Binary files differnew file mode 100644 index 000000000..0ad839286 --- /dev/null +++ b/res/drawable-xhdpi/ic_handle.png diff --git a/res/drawable-xxhdpi/ic_handle.png b/res/drawable-xxhdpi/ic_handle.png Binary files differnew file mode 100644 index 000000000..d07a1d057 --- /dev/null +++ b/res/drawable-xxhdpi/ic_handle.png diff --git a/res/drawable/ic_voicemail_seek_handle.xml b/res/drawable/ic_voicemail_seek_handle.xml new file mode 100644 index 000000000..a6f02be7e --- /dev/null +++ b/res/drawable/ic_voicemail_seek_handle.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/ic_handle" + android:autoMirrored="true" + android:tint="@color/actionbar_background_color" > +</bitmap>
\ No newline at end of file diff --git a/res/drawable/seek_bar_thumb.xml b/res/drawable/seek_bar_thumb.xml deleted file mode 100644 index e301d1fd0..000000000 --- a/res/drawable/seek_bar_thumb.xml +++ /dev/null @@ -1,55 +0,0 @@ -<?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. ---> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="true"> - <layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <!-- First item is the outer transparent sphere. --> - <item> - <shape - android:shape="oval" - > - <size - android:width="16dip" - android:height="16dip" - /> - <solid - android:color="#44cecece" - /> - </shape> - </item> - <!-- Second item is the inner almost-opaque sphere. - Seems to derive its size from the outer, a size element doesn't change anything. - Looks like using left, right, top and bottom on the item is best to fix inner sphere. --> - <item - android:left="3dip" - android:right="3dip" - android:top="3dip" - android:bottom="3dip" - > - <shape - android:shape="oval" - > - <solid - android:color="@color/background_dialer_list_items" - /> - </shape> - </item> - </layer-list> - </item> - - <!-- Do not show the thumb when disabled --> - <item android:drawable="@android:color/transparent" /> -</selector>
\ No newline at end of file diff --git a/res/layout/playback_layout.xml b/res/layout/playback_layout.xml index 500ed96b5..54d0c5955 100644 --- a/res/layout/playback_layout.xml +++ b/res/layout/playback_layout.xml @@ -64,7 +64,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:progressDrawable="@drawable/seekbar_drawable" - android:thumb="@drawable/seek_bar_thumb" + android:thumb="@drawable/ic_voicemail_seek_handle" android:thumbOffset="8dip" android:progress="0" android:paddingStart="8dip" |