Merge "Fix RTL for SignalDrawable" into oc-dev

1 files changed, 11 insertions, 0 deletions

diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java
index a9eb20ba3a57..8cd87910f945 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/SignalDrawable.java
@@ -30,6 +30,7 @@ import android.graphics.Path.Op;
 import android.graphics.Rect;
 import android.graphics.drawable.Drawable;
 import android.os.Handler;
+import android.util.LayoutDirection;
 import android.util.Log;
 
 import com.android.settingslib.R;
@@ -192,6 +193,13 @@ public class SignalDrawable extends Drawable {
 
     @Override
     public void draw(@NonNull Canvas canvas) {
+        boolean isRtl = getLayoutDirection() == LayoutDirection.RTL;
+        if (isRtl) {
+            canvas.save();
+            // Mirror the drawable
+            canvas.translate(canvas.getWidth(), 0);
+            canvas.scale(-1.0f, 1.0f);
+        }
         mFullPath.reset();
         mFullPath.setFillType(FillType.WINDING);
         float width = getBounds().width();
@@ -250,6 +258,9 @@ public class SignalDrawable extends Drawable {
             }
             canvas.drawPath(mXPath, mForegroundPaint);
         }
+        if (isRtl) {
+            canvas.restore();
+        }
     }
 
     private void drawDot(Path fullPath, Path foregroundPath, float x, float y, float dotSize,