diff options
| author | Jeff Brown <jeffbrown@google.com> | 2012-08-29 15:46:37 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-08-29 15:46:37 -0700 |
| commit | 70ffc1bef022121ac252514338dc3b1eccf7141a (patch) | |
| tree | 8834b7f8e3b6e62a1de6f44dc89cf733f99ff057 /cmds/monkey | |
| parent | faaab7f0ef3f480e09ff236571f96bb4869ae5ce (diff) | |
| parent | 75cd1b5bc411a599b9fbb632e96edcbdd9a0e1f8 (diff) | |
| download | android_development-70ffc1bef022121ac252514338dc3b1eccf7141a.tar.gz android_development-70ffc1bef022121ac252514338dc3b1eccf7141a.tar.bz2 android_development-70ffc1bef022121ac252514338dc3b1eccf7141a.zip | |
am 75cd1b5b: am 99c82587: Merge "Use new display manager API." into jb-mr1-dev
* commit '75cd1b5bc411a599b9fbb632e96edcbdd9a0e1f8':
Use new display manager API.
Diffstat (limited to 'cmds/monkey')
| -rw-r--r-- | cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java | 4 | ||||
| -rw-r--r-- | cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java index ff3a6866e..9abfe265b 100644 --- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java +++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java @@ -15,7 +15,7 @@ */ package com.android.commands.monkey; -import android.hardware.display.DisplayManager; +import android.hardware.display.DisplayManagerGlobal; import android.os.Build; import android.os.SystemClock; import android.view.Display; @@ -82,7 +82,7 @@ public class MonkeySourceNetworkVars { VAR_MAP.put("build.version.codename", new StaticVarGetter(Build.VERSION.CODENAME)); // Display - Display display = DisplayManager.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY); + Display display = DisplayManagerGlobal.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY); VAR_MAP.put("display.width", new StaticVarGetter(Integer.toString(display.getWidth()))); VAR_MAP.put("display.height", new StaticVarGetter(Integer.toString(display.getHeight()))); diff --git a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java index e0ebd0352..a7f538d85 100644 --- a/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java +++ b/cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java @@ -18,7 +18,7 @@ package com.android.commands.monkey; import android.content.ComponentName; import android.graphics.PointF; -import android.hardware.display.DisplayManager; +import android.hardware.display.DisplayManagerGlobal; import android.os.SystemClock; import android.view.Display; import android.view.KeyCharacterMap; @@ -259,7 +259,7 @@ public class MonkeySourceRandom implements MonkeyEventSource { * */ private void generatePointerEvent(Random random, int gesture) { - Display display = DisplayManager.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY); + Display display = DisplayManagerGlobal.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY); PointF p1 = randomPoint(random, display); PointF v1 = randomVector(random); |