am a876854d: am 5ded06ec: am 40fdd482: am c05b739c: Merge "Settings: Update media & alarm stream icons." into lmp-dev

* commit 'a876854d8e119fe464122b082882a6ec34fe4529':
  Settings: Update media & alarm stream icons.
This commit is contained in:
John Spurlock
2014-10-03 14:14:35 +00:00
committed by Android Git Automerger
7 changed files with 45 additions and 405 deletions

View File

@@ -0,0 +1,20 @@
<!--
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.
-->
<!-- shrink ic_audio_alarm from 32dp to 24dp using insets -->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@*android:drawable/ic_audio_alarm"
android:inset="4dp"
/>

View File

@@ -0,0 +1,20 @@
<!--
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.
-->
<!-- shrink ic_audio_vol from 32dp to 24dp using insets -->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@*android:drawable/ic_audio_vol"
android:inset="4dp"
/>

View File

@@ -16,9 +16,6 @@ Copyright (C) 2014 The Android Open Source Project
<!-- shrink ic_audio_ring_notif from 32dp to 24dp using insets -->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@*android:drawable/ic_audio_ring_notif"
android:insetLeft="4dp"
android:insetRight="4dp"
android:insetTop="4dp"
android:insetBottom="4dp"
android:inset="4dp"
/>

View File

@@ -16,8 +16,5 @@ Copyright (C) 2014 The Android Open Source Project
<!-- shrink ic_audio_ring_notif_mute from 32dp to 24dp using insets -->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@*android:drawable/ic_audio_ring_notif_mute"
android:insetLeft="4dp"
android:insetRight="4dp"
android:insetTop="4dp"
android:insetBottom="4dp"
android:inset="4dp"
/>

View File

@@ -16,8 +16,5 @@ Copyright (C) 2014 The Android Open Source Project
<!-- shrink ic_audio_ring_notif_vibrate from 32dp to 24dp using insets -->
<inset xmlns:android="http://schemas.android.com/apk/res/android"
android:drawable="@*android:drawable/ic_audio_ring_notif_vibrate"
android:insetLeft="4dp"
android:insetRight="4dp"
android:insetTop="4dp"
android:insetBottom="4dp"
android:inset="4dp"
/>

View File

@@ -27,13 +27,13 @@
<!-- Media volume -->
<com.android.settings.notification.VolumeSeekBarPreference
android:key="media_volume"
android:icon="@*android:drawable/ic_audio_vol"
android:icon="@drawable/ic_audio_vol_24dp"
android:title="@string/media_volume_option_title" />
<!-- Alarm volume -->
<com.android.settings.notification.VolumeSeekBarPreference
android:key="alarm_volume"
android:icon="@*android:drawable/ic_audio_alarm"
android:icon="@drawable/ic_audio_alarm_24dp"
android:title="@string/alarm_volume_option_title" />
<!-- Ring volume -->