LineageOS/android_development
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

am f9fc2a56: Use new display manager API.

Browse Source 
* commit 'f9fc2a56f18b5d9684b48f0fe7a4e3b24eab5847':
  Use new display manager API.
This commit is contained in:
Jeff Brown
2012-08-19 23:08:28 -07:00
committed by Android Git Automerger
parent 851d9b25e8 f9fc2a56f1
commit 3eadba6778
2 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkVars.java
View File

@@ -15,10 +15,10 @@
*/ */
package com.android.commands.monkey; package com.android.commands.monkey;
import android.hardware.display.DisplayManager;
import android.os.Build; import android.os.Build;
import android.os.SystemClock; import android.os.SystemClock;
import android.view.Display; import android.view.Display;
import android.view.WindowManagerImpl;
import android.util.DisplayMetrics; import android.util.DisplayMetrics;
import com.android.commands.monkey.MonkeySourceNetwork.CommandQueue; import com.android.commands.monkey.MonkeySourceNetwork.CommandQueue;
@@ -82,7 +82,7 @@ public class MonkeySourceNetworkVars {
VAR_MAP.put("build.version.codename", new StaticVarGetter(Build.VERSION.CODENAME)); VAR_MAP.put("build.version.codename", new StaticVarGetter(Build.VERSION.CODENAME));
// Display // Display
Display display = WindowManagerImpl.getDefault().getDefaultDisplay(); Display display = DisplayManager.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY);
VAR_MAP.put("display.width", new StaticVarGetter(Integer.toString(display.getWidth()))); VAR_MAP.put("display.width", new StaticVarGetter(Integer.toString(display.getWidth())));
VAR_MAP.put("display.height", new StaticVarGetter(Integer.toString(display.getHeight()))); VAR_MAP.put("display.height", new StaticVarGetter(Integer.toString(display.getHeight())));

10
cmds/monkey/src/com/android/commands/monkey/MonkeySourceRandom.java
View File

@@ -18,13 +18,13 @@ package com.android.commands.monkey;
import android.content.ComponentName; import android.content.ComponentName;
import android.graphics.PointF; import android.graphics.PointF;
import android.hardware.display.DisplayManager;
import android.os.SystemClock; import android.os.SystemClock;
import android.view.Display; import android.view.Display;
import android.view.KeyCharacterMap; import android.view.KeyCharacterMap;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.MotionEvent; import android.view.MotionEvent;
import android.view.Surface; import android.view.Surface;
import android.view.WindowManagerImpl;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Random; import java.util.Random;
@@ -258,8 +258,8 @@ public class MonkeySourceRandom implements MonkeyEventSource {
* @param gesture The gesture to perform. * @param gesture The gesture to perform.
* *
*/ */
private void generatePointerEvent(Random random, int gesture){ private void generatePointerEvent(Random random, int gesture) {
Display display = WindowManagerImpl.getDefault().getDefaultDisplay(); Display display = DisplayManager.getInstance().getRealDisplay(Display.DEFAULT_DISPLAY);
PointF p1 = randomPoint(random, display); PointF p1 = randomPoint(random, display);
PointF v1 = randomVector(random); PointF v1 = randomVector(random);
@@ -350,10 +350,6 @@ public class MonkeySourceRandom implements MonkeyEventSource {
* *
*/ */
private void generateTrackballEvent(Random random) { private void generateTrackballEvent(Random random) {
Display display = WindowManagerImpl.getDefault().getDefaultDisplay();
boolean drop = false;
int count = random.nextInt(10);
for (int i = 0; i < 10; ++i) { for (int i = 0; i < 10; ++i) {
// generate a small random step // generate a small random step
int dX = random.nextInt(10) - 5; int dX = random.nextInt(10) - 5;