Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make hasOverlappingRendering() method more accurate" into jb-mr2-dev

Browse Source
This commit is contained in:
Michael Jurka
2013-03-21 17:04:54 +00:00
committed by Android (Google) Code Review
parent bce0fa8133 0931a8516a
commit 6812efd24e
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/widget/ImageView.java
View File

@@ -204,7 +204,7 @@ public class ImageView extends View {
@Override
public boolean hasOverlappingRendering() {
return (getBackground() != null);
return (getBackground() != null && getBackground().getCurrent() != null);
}
@Override

3
core/java/android/widget/TextView.java
View File

@@ -4794,7 +4794,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());
}
/**