diff --git a/core/java/android/view/VolumePanel.java b/core/java/android/view/VolumePanel.java index d4e27bce52893..e711b94b681dc 100644 --- a/core/java/android/view/VolumePanel.java +++ b/core/java/android/view/VolumePanel.java @@ -337,6 +337,11 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie listenToRingerMode(); } + public void setLayoutDirection(int layoutDirection) { + mPanel.setLayoutDirection(layoutDirection); + updateStates(); + } + private void listenToRingerMode() { final IntentFilter filter = new IntentFilter(); filter.addAction(AudioManager.RINGER_MODE_CHANGED_ACTION); @@ -460,6 +465,8 @@ public class VolumePanel extends Handler implements OnSeekBarChangeListener, Vie private void updateSlider(StreamControl sc) { sc.seekbarView.setProgress(getStreamVolume(sc.streamType)); final boolean muted = isMuted(sc.streamType); + // Force reloading the image resource + sc.icon.setImageDrawable(null); sc.icon.setImageResource(muted ? sc.iconMuteRes : sc.iconRes); if (sc.streamType == AudioManager.STREAM_RING && mAudioManager.getRingerMode() == AudioManager.RINGER_MODE_VIBRATE) { diff --git a/core/res/res/drawable-ldrtl-hdpi/ic_audio_notification.png b/core/res/res/drawable-ldrtl-hdpi/ic_audio_notification.png new file mode 100644 index 0000000000000..62ef69217c8a1 Binary files /dev/null and b/core/res/res/drawable-ldrtl-hdpi/ic_audio_notification.png differ diff --git a/core/res/res/drawable-ldrtl-hdpi/ic_audio_notification_mute.png b/core/res/res/drawable-ldrtl-hdpi/ic_audio_notification_mute.png new file mode 100644 index 0000000000000..40123e32c3090 Binary files /dev/null and b/core/res/res/drawable-ldrtl-hdpi/ic_audio_notification_mute.png differ diff --git a/core/res/res/drawable-ldrtl-hdpi/ic_audio_phone.png b/core/res/res/drawable-ldrtl-hdpi/ic_audio_phone.png new file mode 100644 index 0000000000000..968f5eefd0e14 Binary files /dev/null and b/core/res/res/drawable-ldrtl-hdpi/ic_audio_phone.png differ diff --git a/core/res/res/drawable-ldrtl-hdpi/ic_audio_ring_notif.png b/core/res/res/drawable-ldrtl-hdpi/ic_audio_ring_notif.png new file mode 100644 index 0000000000000..e5f0dcff6ee02 Binary files /dev/null and b/core/res/res/drawable-ldrtl-hdpi/ic_audio_ring_notif.png differ diff --git a/core/res/res/drawable-ldrtl-hdpi/ic_audio_ring_notif_mute.png b/core/res/res/drawable-ldrtl-hdpi/ic_audio_ring_notif_mute.png new file mode 100644 index 0000000000000..371e32f7b088b Binary files /dev/null and b/core/res/res/drawable-ldrtl-hdpi/ic_audio_ring_notif_mute.png differ diff --git a/core/res/res/drawable-ldrtl-hdpi/ic_audio_ring_notif_vibrate.png b/core/res/res/drawable-ldrtl-hdpi/ic_audio_ring_notif_vibrate.png new file mode 100644 index 0000000000000..e05e8f518081f Binary files /dev/null and b/core/res/res/drawable-ldrtl-hdpi/ic_audio_ring_notif_vibrate.png differ diff --git a/core/res/res/drawable-ldrtl-hdpi/ic_audio_vol.png b/core/res/res/drawable-ldrtl-hdpi/ic_audio_vol.png new file mode 100644 index 0000000000000..81a8422b17a62 Binary files /dev/null and b/core/res/res/drawable-ldrtl-hdpi/ic_audio_vol.png differ diff --git a/core/res/res/drawable-ldrtl-hdpi/ic_audio_vol_mute.png b/core/res/res/drawable-ldrtl-hdpi/ic_audio_vol_mute.png new file mode 100644 index 0000000000000..371e32f7b088b Binary files /dev/null and b/core/res/res/drawable-ldrtl-hdpi/ic_audio_vol_mute.png differ diff --git a/core/res/res/drawable-ldrtl-mdpi/ic_audio_notification.png b/core/res/res/drawable-ldrtl-mdpi/ic_audio_notification.png new file mode 100644 index 0000000000000..d9843e0ad1d1f Binary files /dev/null and b/core/res/res/drawable-ldrtl-mdpi/ic_audio_notification.png differ diff --git a/core/res/res/drawable-ldrtl-mdpi/ic_audio_notification_mute.png b/core/res/res/drawable-ldrtl-mdpi/ic_audio_notification_mute.png new file mode 100644 index 0000000000000..2159cabc3610c Binary files /dev/null and b/core/res/res/drawable-ldrtl-mdpi/ic_audio_notification_mute.png differ diff --git a/core/res/res/drawable-ldrtl-mdpi/ic_audio_phone.png b/core/res/res/drawable-ldrtl-mdpi/ic_audio_phone.png new file mode 100644 index 0000000000000..b5af351f521a6 Binary files /dev/null and b/core/res/res/drawable-ldrtl-mdpi/ic_audio_phone.png differ diff --git a/core/res/res/drawable-ldrtl-mdpi/ic_audio_ring_notif.png b/core/res/res/drawable-ldrtl-mdpi/ic_audio_ring_notif.png new file mode 100644 index 0000000000000..6341be66bc147 Binary files /dev/null and b/core/res/res/drawable-ldrtl-mdpi/ic_audio_ring_notif.png differ diff --git a/core/res/res/drawable-ldrtl-mdpi/ic_audio_ring_notif_mute.png b/core/res/res/drawable-ldrtl-mdpi/ic_audio_ring_notif_mute.png new file mode 100644 index 0000000000000..b4c3a54c882b3 Binary files /dev/null and b/core/res/res/drawable-ldrtl-mdpi/ic_audio_ring_notif_mute.png differ diff --git a/core/res/res/drawable-ldrtl-mdpi/ic_audio_ring_notif_vibrate.png b/core/res/res/drawable-ldrtl-mdpi/ic_audio_ring_notif_vibrate.png new file mode 100644 index 0000000000000..835773e7aa2f0 Binary files /dev/null and b/core/res/res/drawable-ldrtl-mdpi/ic_audio_ring_notif_vibrate.png differ diff --git a/core/res/res/drawable-ldrtl-mdpi/ic_audio_vol.png b/core/res/res/drawable-ldrtl-mdpi/ic_audio_vol.png new file mode 100644 index 0000000000000..947d1f94e5e36 Binary files /dev/null and b/core/res/res/drawable-ldrtl-mdpi/ic_audio_vol.png differ diff --git a/core/res/res/drawable-ldrtl-mdpi/ic_audio_vol_mute.png b/core/res/res/drawable-ldrtl-mdpi/ic_audio_vol_mute.png new file mode 100644 index 0000000000000..b4c3a54c882b3 Binary files /dev/null and b/core/res/res/drawable-ldrtl-mdpi/ic_audio_vol_mute.png differ diff --git a/core/res/res/drawable-ldrtl-xhdpi/ic_audio_notification.png b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_notification.png new file mode 100644 index 0000000000000..43aedeaa9ea12 Binary files /dev/null and b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_notification.png differ diff --git a/core/res/res/drawable-ldrtl-xhdpi/ic_audio_notification_mute.png b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_notification_mute.png new file mode 100644 index 0000000000000..4e87f77083108 Binary files /dev/null and b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_notification_mute.png differ diff --git a/core/res/res/drawable-ldrtl-xhdpi/ic_audio_phone.png b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_phone.png new file mode 100644 index 0000000000000..1066d03f879db Binary files /dev/null and b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_phone.png differ diff --git a/core/res/res/drawable-ldrtl-xhdpi/ic_audio_ring_notif.png b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_ring_notif.png new file mode 100644 index 0000000000000..daf9213f09613 Binary files /dev/null and b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_ring_notif.png differ diff --git a/core/res/res/drawable-ldrtl-xhdpi/ic_audio_ring_notif_mute.png b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_ring_notif_mute.png new file mode 100644 index 0000000000000..83d3bdde08813 Binary files /dev/null and b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_ring_notif_mute.png differ diff --git a/core/res/res/drawable-ldrtl-xhdpi/ic_audio_ring_notif_vibrate.png b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_ring_notif_vibrate.png new file mode 100644 index 0000000000000..4de95aad32a7d Binary files /dev/null and b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_ring_notif_vibrate.png differ diff --git a/core/res/res/drawable-ldrtl-xhdpi/ic_audio_vol.png b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_vol.png new file mode 100644 index 0000000000000..81329265541fe Binary files /dev/null and b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_vol.png differ diff --git a/core/res/res/drawable-ldrtl-xhdpi/ic_audio_vol_mute.png b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_vol_mute.png new file mode 100644 index 0000000000000..83d3bdde08813 Binary files /dev/null and b/core/res/res/drawable-ldrtl-xhdpi/ic_audio_vol_mute.png differ diff --git a/media/java/android/media/AudioService.java b/media/java/android/media/AudioService.java index 9aac0e6b8cd5f..fb66df04d534c 100644 --- a/media/java/android/media/AudioService.java +++ b/media/java/android/media/AudioService.java @@ -5991,6 +5991,7 @@ public class AudioService extends IAudioService.Stub implements OnFinished { } } } + mVolumePanel.setLayoutDirection(config.getLayoutDirection()); } catch (Exception e) { Log.e(TAG, "Error retrieving device orientation: " + e); }