summaryrefslogtreecommitdiffstats
path: root/services/java/com/android/server/InputWindow.java
diff options
context:
space:
mode:
authorJeff Brown <jeffbrown@google.com>2011-01-16 19:22:01 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2011-01-16 19:22:01 -0800
commit5cdf07524132722e0db69db1ca8dcaf3f0073265 (patch)
tree6be3ec5a643f26f6050921430f64ffc385e89df5 /services/java/com/android/server/InputWindow.java
parent805fd7ee0e5dc2939e85c84f78d9890a51982bc0 (diff)
parentfbf097732137a32930d151f7ba6816a5b870c32a (diff)
downloadframeworks_base-5cdf07524132722e0db69db1ca8dcaf3f0073265.zip
frameworks_base-5cdf07524132722e0db69db1ca8dcaf3f0073265.tar.gz
frameworks_base-5cdf07524132722e0db69db1ca8dcaf3f0073265.tar.bz2
Merge "Support non-rectangular input regions." into honeycomb
Diffstat (limited to 'services/java/com/android/server/InputWindow.java')
-rw-r--r--services/java/com/android/server/InputWindow.java16
1 files changed, 4 insertions, 12 deletions
diff --git a/services/java/com/android/server/InputWindow.java b/services/java/com/android/server/InputWindow.java
index 1515290..2c2cdfe 100644
--- a/services/java/com/android/server/InputWindow.java
+++ b/services/java/com/android/server/InputWindow.java
@@ -16,6 +16,7 @@
package com.android.server;
+import android.graphics.Region;
import android.view.InputChannel;
/**
@@ -39,23 +40,14 @@ public final class InputWindow {
// Dispatching timeout.
public long dispatchingTimeoutNanos;
- // Window frame area.
+ // Window frame.
public int frameLeft;
public int frameTop;
public int frameRight;
public int frameBottom;
- // Window visible frame area.
- public int visibleFrameLeft;
- public int visibleFrameTop;
- public int visibleFrameRight;
- public int visibleFrameBottom;
-
- // Window touchable area.
- public int touchableAreaLeft;
- public int touchableAreaTop;
- public int touchableAreaRight;
- public int touchableAreaBottom;
+ // Window touchable region.
+ public final Region touchableRegion = new Region();
// Window is visible.
public boolean visible;