am 41aabeb5: am 1e6a3a53: Merge "Added more robust tracking and cancelation of events." into gingerbread

Merge commit '41aabeb51305d19747687f246080f44fc2a74435'

* commit '41aabeb51305d19747687f246080f44fc2a74435':
  Added more robust tracking and cancelation of events.
This commit is contained in:
Jeff Brown
2010-10-11 17:42:30 -07:00
committed by Android Git Automerger
10 changed files with 519 additions and 427 deletions

View File

@@ -49,6 +49,8 @@ import java.util.Properties;
public class InputManager {
static final String TAG = "InputManager";
private static final boolean DEBUG = false;
private final Callbacks mCallbacks;
private final Context mContext;
private final WindowManagerService mWindowManagerService;
@@ -131,7 +133,9 @@ public class InputManager {
throw new IllegalArgumentException("Invalid display id or dimensions.");
}
Slog.i(TAG, "Setting display #" + displayId + " size to " + width + "x" + height);
if (DEBUG) {
Slog.d(TAG, "Setting display #" + displayId + " size to " + width + "x" + height);
}
nativeSetDisplaySize(displayId, width, height);
}
@@ -140,7 +144,9 @@ public class InputManager {
throw new IllegalArgumentException("Invalid rotation.");
}
Slog.i(TAG, "Setting display #" + displayId + " orientation to " + rotation);
if (DEBUG) {
Slog.d(TAG, "Setting display #" + displayId + " orientation to " + rotation);
}
nativeSetDisplayOrientation(displayId, rotation);
}