summaryrefslogtreecommitdiffstats
path: root/core/java/android/view/View.java
diff options
context:
space:
mode:
authorChet Haase <chet@google.com>2013-03-26 01:59:22 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2013-03-26 01:59:22 +0000
commit89d4c0f3cb88b6366f26b1745db78bcef3680831 (patch)
tree5fd16414a69cf60f36fec99ef0f4437f8afe6ee2 /core/java/android/view/View.java
parent98157242e231d6415672dec751f81f8e32e43563 (diff)
parent656ed307168ec2006108877a03788a31b15ebb78 (diff)
downloadframeworks_base-89d4c0f3cb88b6366f26b1745db78bcef3680831.zip
frameworks_base-89d4c0f3cb88b6366f26b1745db78bcef3680831.tar.gz
frameworks_base-89d4c0f3cb88b6366f26b1745db78bcef3680831.tar.bz2
am 656ed307: am bc6c050f: Merge "Fix touch processing for Overlay views" into jb-mr2-dev
* commit '656ed307168ec2006108877a03788a31b15ebb78': Fix touch processing for Overlay views
Diffstat (limited to 'core/java/android/view/View.java')
-rw-r--r--core/java/android/view/View.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/core/java/android/view/View.java b/core/java/android/view/View.java
index 6badadc..d39be14 100644
--- a/core/java/android/view/View.java
+++ b/core/java/android/view/View.java
@@ -12101,7 +12101,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
//System.out.println("Attached! " + this);
mAttachInfo = info;
if (mOverlay != null) {
- mOverlay.mAttachInfo = info;
+ mOverlay.dispatchAttachedToWindow(info, visibility);
}
mWindowAttachCount++;
// We will need to evaluate the drawable state at least once.
@@ -12172,7 +12172,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
mAttachInfo = null;
if (mOverlay != null) {
- mOverlay.mAttachInfo = null;
+ mOverlay.dispatchDetachedFromWindow();
}
}