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

Commit a383eba1 authored by Michael Jurka's avatar Michael Jurka Committed by Android Git Automerger
Browse files

am 953a9466: am 6812efd2: Merge "Make hasOverlappingRendering() method more... 

am 953a9466: am 6812efd2: Merge "Make hasOverlappingRendering() method more accurate" into jb-mr2-dev

* commit '953a9466':
  Make hasOverlappingRendering() method more accurate
parents 8d48696f 953a9466

core/java/android/widget/ImageView.java

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


    @Override

    public boolean hasOverlappingRendering() {

        return (getBackground() != null);

        return (getBackground() != null && getBackground().getCurrent() != null);

    }



    @Override

core/java/android/widget/TextView.java

+2 −1
Original line number Diff line number Diff line
@@ -4801,7 +4801,8 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener 


    @Override

    public boolean hasOverlappingRendering() {

        return (getBackground() != null || mText instanceof Spannable || hasSelection());

        return ((getBackground() != null && getBackground().getCurrent() != null)

                || mText instanceof Spannable || hasSelection());

    }



    /**