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

Commit 6e10b08b authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

Merge "Fix overrides of isLayoutRtl(Drawable dr)"

parents 0d54201b a98eef86

core/java/android/widget/ImageView.java

+1 −1
Original line number Diff line number Diff line
@@ -188,7 +188,7 @@ public class ImageView extends View { 


    @Override

    public boolean isLayoutRtl(Drawable dr) {

        return ((dr == mDrawable) && isLayoutRtl()) || super.isLayoutRtl(dr);

        return (dr == mDrawable) ? isLayoutRtl() : super.isLayoutRtl(dr);

    }



    @Override

core/java/android/widget/ProgressBar.java

+2 −2
Original line number Diff line number Diff line
@@ -917,8 +917,8 @@ public class ProgressBar extends View { 


    @Override

    public boolean isLayoutRtl(Drawable who) {

        return ((who == mProgressDrawable || who == mIndeterminateDrawable) && isLayoutRtl()) ||

            super.isLayoutRtl(who);

        return (who == mProgressDrawable || who == mIndeterminateDrawable) ?

            isLayoutRtl() : super.isLayoutRtl(who);

    }



    @Override