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

Commit a98eef86 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio
Browse files

Fix overrides of isLayoutRtl(Drawable dr) 

Change-Id: I7042805747db134d93e39cbb41773d8d5a1cb370
parent 5ff0f99b

core/java/android/widget/ImageView.java

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




    @Override

    @Override

    public boolean isLayoutRtl(Drawable dr) {

    public boolean isLayoutRtl(Drawable dr) {

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

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

    }

    }





    @Override

    @Override

core/java/android/widget/ProgressBar.java

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




    @Override

    @Override

    public boolean isLayoutRtl(Drawable who) {

    public boolean isLayoutRtl(Drawable who) {

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

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

            super.isLayoutRtl(who);

            isLayoutRtl() : super.isLayoutRtl(who);

    }

    }





    @Override

    @Override