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

am 99c82587: Merge "Use new display manager API." into jb-mr1-dev

Browse Source 
* commit '99c82587b170497eeb8518db79beba8625038019':
  Use new display manager API.
This commit is contained in:
Jeff Brown
2012-08-29 15:44:48 -07:00
committed by Android Git Automerger
parent 6a7a7de580 99c82587b1
commit 75cd1b5bc4
2 changed files with 4 additions and 4 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,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())));

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

@@ -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);