Merge "Fix bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)"

13 files changed, 7 insertions, 2 deletions

diff --git a/core/res/res/drawable-ldrtl-hdpi/ic_lock_airplane_mode_off.png b/core/res/res/drawable-ldrtl-hdpi/ic_lock_airplane_mode_off.png
new file mode 100644
index 000000000000..7b1eee61125f
--- /dev/null
+++ b/core/res/res/drawable-ldrtl-hdpi/ic_lock_airplane_mode_off.png
diff --git a/core/res/res/drawable-ldrtl-hdpi/ic_menu_cc.png b/core/res/res/drawable-ldrtl-hdpi/ic_menu_cc.png
new file mode 100644
index 000000000000..aedf9b108f3a
--- /dev/null
+++ b/core/res/res/drawable-ldrtl-hdpi/ic_menu_cc.png
diff --git a/core/res/res/drawable-ldrtl-hdpi/stat_sys_adb.png b/core/res/res/drawable-ldrtl-hdpi/stat_sys_adb.png
new file mode 100644
index 000000000000..a7dc29dda463
--- /dev/null
+++ b/core/res/res/drawable-ldrtl-hdpi/stat_sys_adb.png
diff --git a/core/res/res/drawable-ldrtl-ldpi/ic_lock_airplane_mode_off.png b/core/res/res/drawable-ldrtl-ldpi/ic_lock_airplane_mode_off.png
new file mode 100644
index 000000000000..c093420c7a91
--- /dev/null
+++ b/core/res/res/drawable-ldrtl-ldpi/ic_lock_airplane_mode_off.png
diff --git a/core/res/res/drawable-ldrtl-ldpi/ic_menu_cc.png b/core/res/res/drawable-ldrtl-ldpi/ic_menu_cc.png
new file mode 100644
index 000000000000..1f21884d8d72
--- /dev/null
+++ b/core/res/res/drawable-ldrtl-ldpi/ic_menu_cc.png
diff --git a/core/res/res/drawable-ldrtl-ldpi/stat_sys_adb.png b/core/res/res/drawable-ldrtl-ldpi/stat_sys_adb.png
new file mode 100644
index 000000000000..d726b7ad93ec
--- /dev/null
+++ b/core/res/res/drawable-ldrtl-ldpi/stat_sys_adb.png
diff --git a/core/res/res/drawable-ldrtl-mdpi/ic_lock_airplane_mode_off.png b/core/res/res/drawable-ldrtl-mdpi/ic_lock_airplane_mode_off.png
new file mode 100644
index 000000000000..cba550088b2f
--- /dev/null
+++ b/core/res/res/drawable-ldrtl-mdpi/ic_lock_airplane_mode_off.png
diff --git a/core/res/res/drawable-ldrtl-mdpi/ic_menu_cc.png b/core/res/res/drawable-ldrtl-mdpi/ic_menu_cc.png
new file mode 100644
index 000000000000..0335dec6a7fa
--- /dev/null
+++ b/core/res/res/drawable-ldrtl-mdpi/ic_menu_cc.png
diff --git a/core/res/res/drawable-ldrtl-mdpi/stat_sys_adb.png b/core/res/res/drawable-ldrtl-mdpi/stat_sys_adb.png
new file mode 100644
index 000000000000..265c421636fa
--- /dev/null
+++ b/core/res/res/drawable-ldrtl-mdpi/stat_sys_adb.png
diff --git a/core/res/res/drawable-ldrtl-xhdpi/ic_lock_airplane_mode_off.png b/core/res/res/drawable-ldrtl-xhdpi/ic_lock_airplane_mode_off.png
new file mode 100644
index 000000000000..6820a23c2519
--- /dev/null
+++ b/core/res/res/drawable-ldrtl-xhdpi/ic_lock_airplane_mode_off.png
diff --git a/core/res/res/drawable-ldrtl-xhdpi/ic_menu_cc.png b/core/res/res/drawable-ldrtl-xhdpi/ic_menu_cc.png
new file mode 100644
index 000000000000..c8690bdf77f1
--- /dev/null
+++ b/core/res/res/drawable-ldrtl-xhdpi/ic_menu_cc.png
diff --git a/core/res/res/drawable-ldrtl-xhdpi/stat_sys_adb.png b/core/res/res/drawable-ldrtl-xhdpi/stat_sys_adb.png
new file mode 100644
index 000000000000..e3425563a5da
--- /dev/null
+++ b/core/res/res/drawable-ldrtl-xhdpi/stat_sys_adb.png
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
index 3227a34b65c7..01596dcdda1e 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
@@ -838,9 +838,14 @@ public class PhoneStatusBar extends BaseStatusBar {
     }
 
     public void refreshAllStatusBarIcons() {
-        final int count = mStatusIcons.getChildCount();
+        refreshAllIconsForLayout(mStatusIcons);
+        refreshAllIconsForLayout(mNotificationIcons);
+    }
+
+    private void refreshAllIconsForLayout(LinearLayout ll) {
+        final int count = ll.getChildCount();
         for (int n = 0; n < count; n++) {
-            View child = mStatusIcons.getChildAt(n);
+            View child = ll.getChildAt(n);
             if (child instanceof StatusBarIconView) {
                 ((StatusBarIconView) child).updateDrawable();
             }