diff --git a/src/com/android/settings/widget/DonutView.java b/src/com/android/settings/widget/DonutView.java
index 629e35e..330249b 100644
--- a/src/com/android/settings/widget/DonutView.java
+++ b/src/com/android/settings/widget/DonutView.java
@@ -26,11 +26,15 @@
 import android.graphics.Typeface;
 import android.support.annotation.ColorRes;
 import android.text.TextPaint;
+import android.text.TextUtils;
 import android.util.AttributeSet;
 import android.view.View;
+
 import com.android.settings.R;
 import com.android.settings.Utils;
 
+import java.util.Locale;
+
 /**
  * DonutView represents a donut graph. It visualizes a certain percentage of fullness with a
  * corresponding label with the fullness on the inside (i.e. "50%" inside of the donut).
@@ -101,12 +105,19 @@
             mFilledArc.setColorFilter(mAccentColorFilter);
         }
 
+        final Locale locale = resources.getConfiguration().locale;
+        final int layoutDirection = TextUtils.getLayoutDirectionFromLocale(locale);
+        final int bidiFlags = (layoutDirection == LAYOUT_DIRECTION_LTR)
+                ? Paint.BIDI_LTR
+                : Paint.BIDI_RTL;
+
         mTextPaint = new TextPaint();
         mTextPaint.setColor(Utils.getColorAccent(getContext()));
         mTextPaint.setAntiAlias(true);
         mTextPaint.setTextSize(
                 resources.getDimension(R.dimen.storage_donut_view_label_text_size));
         mTextPaint.setTextAlign(Paint.Align.CENTER);
+        mTextPaint.setBidiFlags(bidiFlags);
 
         mBigNumberPaint = new TextPaint();
         mBigNumberPaint.setColor(Utils.getColorAccent(getContext()));
@@ -117,6 +128,7 @@
         mBigNumberPaint.setTypeface(Typeface.create(
                 context.getString(com.android.internal.R.string.config_headlineFontFamily),
                 Typeface.NORMAL));
+        mBigNumberPaint.setBidiFlags(bidiFlags);
     }
 
     @Override
