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

Update required due to framework API change.

Browse Source 
Change-Id: I0c297c978415e2a23df1fc2e70ebfa3e6e00715d
This commit is contained in:
Svetoslav Ganov
2011-08-24 16:35:09 -07:00
parent ce77ef5f1d
commit 33a93ebfe3
1 changed files with 9 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cmds/monkey/src/com/android/commands/monkey/MonkeySourceNetworkViews.java
View File

@@ -28,6 +28,7 @@ import android.graphics.Rect;
import android.os.ServiceManager; import android.os.ServiceManager;
import android.os.RemoteException; import android.os.RemoteException;
import android.util.Log; import android.util.Log;
import android.view.accessibility.AccessibilityInteractionClient;
import android.view.accessibility.AccessibilityNodeInfo; import android.view.accessibility.AccessibilityNodeInfo;
import android.view.accessibility.IAccessibilityManager; import android.view.accessibility.IAccessibilityManager;
import android.view.accessibility.AccessibilityEvent; import android.view.accessibility.AccessibilityEvent;
@@ -203,16 +204,18 @@ public class MonkeySourceNetworkViews {
} }
private static AccessibilityNodeInfo getNodeByAccessibilityIds( private static AccessibilityNodeInfo getNodeByAccessibilityIds(
String windowString, String viewString) throws RemoteException { String windowString, String viewString) {
int windowId = Integer.parseInt(windowString); int windowId = Integer.parseInt(windowString);
int viewId = Integer.parseInt(viewString); int viewId = Integer.parseInt(viewString);
return sConnection.findAccessibilityNodeInfoByAccessibilityId(windowId, viewId); return AccessibilityInteractionClient.getInstance()
.findAccessibilityNodeInfoByAccessibilityId(sConnection, windowId, viewId);
} }
private static AccessibilityNodeInfo getNodeByViewId(String viewId, AccessibilityEvent event) private static AccessibilityNodeInfo getNodeByViewId(String viewId, AccessibilityEvent event)
throws RemoteException, MonkeyViewException { throws MonkeyViewException {
int id = getId(viewId, event); int id = getId(viewId, event);
return sConnection.findAccessibilityNodeInfoByViewIdInActiveWindow(id); return AccessibilityInteractionClient.getInstance()
.findAccessibilityNodeInfoByViewIdInActiveWindow(sConnection, id);
} }
/** /**
@@ -281,8 +284,6 @@ public class MonkeySourceNetworkViews {
node = getNodeByViewId(command.get(2), lastEvent); node = getNodeByViewId(command.get(2), lastEvent);
viewQuery = command.get(3); viewQuery = command.get(3);
args = command.subList(4, command.size()); args = command.subList(4, command.size());
} catch (RemoteException e) {
return new MonkeyCommandReturn(false, REMOTE_ERROR);
} catch (MonkeyViewException e) { } catch (MonkeyViewException e) {
return new MonkeyCommandReturn(false, e.getMessage()); return new MonkeyCommandReturn(false, e.getMessage());
} }
@@ -291,8 +292,6 @@ public class MonkeySourceNetworkViews {
node = getNodeByAccessibilityIds(command.get(2), command.get(3)); node = getNodeByAccessibilityIds(command.get(2), command.get(3));
viewQuery = command.get(4); viewQuery = command.get(4);
args = command.subList(5, command.size()); args = command.subList(5, command.size());
} catch (RemoteException e) {
return new MonkeyCommandReturn(false, REMOTE_ERROR);
} catch (NumberFormatException e) { } catch (NumberFormatException e) {
return EARG; return EARG;
} }
@@ -344,17 +343,9 @@ public class MonkeySourceNetworkViews {
return new MonkeyCommandReturn(false, NO_CONNECTION); return new MonkeyCommandReturn(false, NO_CONNECTION);
} }
if (command.size() == 2) { if (command.size() == 2) {
StringBuilder logs = new StringBuilder();
String text = command.get(1); String text = command.get(1);
List<AccessibilityNodeInfo> nodes; List<AccessibilityNodeInfo> nodes = AccessibilityInteractionClient.getInstance()
try { .findAccessibilityNodeInfosByViewTextInActiveWindow(sConnection, text);
nodes = sConnection.findAccessibilityNodeInfosByViewTextInActiveWindow(text);
} catch (RemoteException e) {
return new MonkeyCommandReturn(false, REMOTE_ERROR);
}
if (nodes == null) {
return new MonkeyCommandReturn(true, "");
}
ViewIntrospectionCommand idGetter = new GetAccessibilityIds(); ViewIntrospectionCommand idGetter = new GetAccessibilityIds();
List<String> emptyArgs = new ArrayList<String>(); List<String> emptyArgs = new ArrayList<String>();
StringBuilder ids = new StringBuilder(); StringBuilder ids = new StringBuilder();