summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJim Miller <jaggies@google.com>2011-01-25 17:41:59 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-25 17:41:59 -0800
commit33f1d0780041d962f911b8908cb4929589f7e4fe (patch)
tree8e039d077508db9ca1741b2ccb3a09d0f76766c8
parent5794f2302209981c64425ea2b661b17f00b8f808 (diff)
parent6f5bd3c3b3b10c60f51b1fe2a2d5da6002930618 (diff)
downloadframeworks_base-33f1d0780041d962f911b8908cb4929589f7e4fe.zip
frameworks_base-33f1d0780041d962f911b8908cb4929589f7e4fe.tar.gz
frameworks_base-33f1d0780041d962f911b8908cb4929589f7e4fe.tar.bz2
Merge "Fix 3338368: Fix bounds calculation for recent apps view" into honeycomb
-rw-r--r--packages/SystemUI/src/com/android/systemui/statusbar/tablet/RecentAppsPanel.java10
1 files changed, 6 insertions, 4 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/RecentAppsPanel.java b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/RecentAppsPanel.java
index 7544f46..a5e2fda 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/tablet/RecentAppsPanel.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/tablet/RecentAppsPanel.java
@@ -98,10 +98,12 @@ public class RecentAppsPanel extends RelativeLayout implements StatusBarPanel, O
};
public boolean isInContentArea(int x, int y) {
- final int l = mRecentsContainer.getPaddingLeft();
- final int r = mRecentsContainer.getWidth() - mRecentsContainer.getPaddingRight();
- final int t = mRecentsContainer.getPaddingTop();
- final int b = mRecentsContainer.getHeight() - mRecentsContainer.getPaddingBottom();
+ // use mRecentsContainer's exact bounds to determine horizontal position
+ final int l = mRecentsContainer.getLeft();
+ final int r = mRecentsContainer.getRight();
+ // use surrounding mRecentsGlowView's position in parent determine vertical bounds
+ final int t = mRecentsGlowView.getTop();
+ final int b = mRecentsGlowView.getBottom();
return x >= l && x < r && y >= t && y < b;
}