diff options
author | Andrew Lee <anwlee@google.com> | 2015-06-26 21:20:32 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-06-26 21:20:33 +0000 |
commit | ea5ffbf122ee93e5337529ea1e4c905c9cff87f7 (patch) | |
tree | 3bd6169637196eca7439bdf857610960668957a7 /res/drawable | |
parent | b0423ed2b6d4519e0c4cda4efb4882b4293459c7 (diff) | |
parent | d88b985229a07b79485cf63f46fa180fd5fe35bd (diff) | |
download | android_packages_apps_Dialer-ea5ffbf122ee93e5337529ea1e4c905c9cff87f7.tar.gz android_packages_apps_Dialer-ea5ffbf122ee93e5337529ea1e4c905c9cff87f7.tar.bz2 android_packages_apps_Dialer-ea5ffbf122ee93e5337529ea1e4c905c9cff87f7.zip |
Merge "Revise layout/style of VoicemailPlaybackLayout." into mnc-dev
Diffstat (limited to 'res/drawable')
-rw-r--r-- | res/drawable/ic_pause.xml (renamed from res/drawable/ic_hold_pause.xml) | 16 | ||||
-rw-r--r-- | res/drawable/ic_play.xml | 21 | ||||
-rw-r--r-- | res/drawable/ic_play_arrow.xml (renamed from res/drawable/ic_minus.xml) | 18 | ||||
-rw-r--r-- | res/drawable/ic_plus.xml | 20 | ||||
-rw-r--r-- | res/drawable/oval_ripple.xml | 26 |
5 files changed, 54 insertions, 47 deletions
diff --git a/res/drawable/ic_hold_pause.xml b/res/drawable/ic_pause.xml index ec9412045..7015a6647 100644 --- a/res/drawable/ic_hold_pause.xml +++ b/res/drawable/ic_pause.xml @@ -15,7 +15,17 @@ --> <selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" - android:drawable="@drawable/ic_vm_pause_dis" /> - <item android:drawable="@drawable/ic_vm_pause_dk" /> + + <item android:state_enabled="false"> + <bitmap + android:src="@drawable/ic_pause_24dp" + android:tint="@color/voicemail_icon_disabled_tint" /> + </item> + + <item> + <bitmap + android:src="@drawable/ic_pause_24dp" + android:tint="@color/voicemail_playpause_icon_tint" /> + </item> + </selector> diff --git a/res/drawable/ic_play.xml b/res/drawable/ic_play.xml deleted file mode 100644 index 6a09c899a..000000000 --- a/res/drawable/ic_play.xml +++ /dev/null @@ -1,21 +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="false" - android:drawable="@drawable/ic_vm_play_dis" /> - <item android:drawable="@drawable/ic_vm_play_dk" /> -</selector> diff --git a/res/drawable/ic_minus.xml b/res/drawable/ic_play_arrow.xml index 2bd0699ec..1a9ee978f 100644 --- a/res/drawable/ic_minus.xml +++ b/res/drawable/ic_play_arrow.xml @@ -14,7 +14,19 @@ limitations under the License. --> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false" android:drawable="@drawable/ic_vm_minus_dis" /> - <item android:drawable="@drawable/ic_vm_minus_dk" /> +<selector xmlns:android="http://schemas.android.com/apk/res/android" + android:autoMirrored="true"> + + <item android:state_enabled="false"> + <bitmap + android:src="@drawable/ic_play_arrow_24dp" + android:tint="@color/voicemail_icon_disabled_tint" /> + </item> + + <item> + <bitmap + android:src="@drawable/ic_play_arrow_24dp" + android:tint="@color/voicemail_playpause_icon_tint" /> + </item> + </selector> diff --git a/res/drawable/ic_plus.xml b/res/drawable/ic_plus.xml deleted file mode 100644 index c60667430..000000000 --- a/res/drawable/ic_plus.xml +++ /dev/null @@ -1,20 +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="false" android:drawable="@drawable/ic_vm_plus_dis" /> - <item android:drawable="@drawable/ic_vm_plus_dk" /> -</selector> diff --git a/res/drawable/oval_ripple.xml b/res/drawable/oval_ripple.xml new file mode 100644 index 000000000..0022d2671 --- /dev/null +++ b/res/drawable/oval_ripple.xml @@ -0,0 +1,26 @@ +<?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 + --> + +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:color="?android:attr/colorControlHighlight" > + <item> + <shape android:shape="oval"> + <solid android:color="#fff" /> + </shape> + </item> +</ripple> |