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

am 71282a47: Merge "Fix access modifiers on ImageView overrides" into ics-mr1

Browse Source 
* commit '71282a476ad57ec398f0a8d33cf67bfd469c8c55':
  Fix access modifiers on ImageView overrides
This commit is contained in:
Adam Powell
2011-11-10 22:18:55 +00:00
committed by Android Git Automerger
parent 8eac3b2f1a 71282a476a
commit aa771ceb09
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1045,7 +1045,7 @@ public class ImageView extends View {
} }
@Override @Override
public void onAttachedToWindow() { protected void onAttachedToWindow() {
super.onAttachedToWindow(); super.onAttachedToWindow();
if (mDrawable != null) { if (mDrawable != null) {
mDrawable.setVisible(getVisibility() == VISIBLE, false); mDrawable.setVisible(getVisibility() == VISIBLE, false);
@@ -1053,7 +1053,7 @@ public class ImageView extends View {
} }
@Override @Override
public void onDetachedFromWindow() { protected void onDetachedFromWindow() {
super.onDetachedFromWindow(); super.onDetachedFromWindow();
if (mDrawable != null) { if (mDrawable != null) {
mDrawable.setVisible(false, false); mDrawable.setVisible(false, false);