Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit cab12d6a authored by Roozbeh Pournader's avatar Roozbeh Pournader Committed by android-build-merger
Browse files

Merge "Set the bidi flags on Paints in DonutView" into oc-mr1-dev 

am: 0f5fadcb

Change-Id: I3482ba65bb5118af2f7eda4b3f07c5ea21caa36e
parents 59bc9095 0f5fadcb

src/com/android/settings/widget/DonutView.java

+12 −0
Original line number Diff line number Diff line
@@ -26,11 +26,15 @@ import android.graphics.PorterDuffColorFilter; 
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 @@ public class DonutView extends View { 
            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 @@ public class DonutView extends View { 
        mBigNumberPaint.setTypeface(Typeface.create(

                context.getString(com.android.internal.R.string.config_headlineFontFamily),

                Typeface.NORMAL));

        mBigNumberPaint.setBidiFlags(bidiFlags);

    }



    @Override