Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use an optimized findViewNodeByAutofillId(id) to get just one node." into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-06-16 21:45:39 +00:00
committed by Android (Google) Code Review
parent 64b044680c 94b56207a4
commit a89414962d
2 changed files with 34 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
core/java/android/service/autofill/FillContext.java
View File

@@ -106,15 +106,15 @@ public final class FillContext implements Parcelable {
}
/**
* Finds {@link ViewNode}s that have the requested ids.
* Finds {@link ViewNode ViewNodes} that have the requested ids.
*
* @param ids The ids of the node to find
* @param ids The ids of the node to find.
*
* @return The nodes indexed in the same way as the ids
* @return The nodes indexed in the same way as the ids.
*
* @hide
*/
@NonNull public ViewNode[] findViewNodesByAutofillIds(@NonNull AutofillId... ids) {
@NonNull public ViewNode[] findViewNodesByAutofillIds(@NonNull AutofillId[] ids) {
final LinkedList<ViewNode> nodesToProcess = new LinkedList<>();
final ViewNode[] foundNodes = new AssistStructure.ViewNode[ids.length];
@@ -178,6 +178,30 @@ public final class FillContext implements Parcelable {
return foundNodes;
}
/**
* Finds the {@link ViewNode} that has the requested {@code id}, if any.
*
* @hide
*/
@Nullable public ViewNode findViewNodeByAutofillId(@NonNull AutofillId id) {
final LinkedList<ViewNode> nodesToProcess = new LinkedList<>();
final int numWindowNodes = mStructure.getWindowNodeCount();
for (int i = 0; i < numWindowNodes; i++) {
nodesToProcess.add(mStructure.getWindowNodeAt(i).getRootViewNode());
}
while (!nodesToProcess.isEmpty()) {
final ViewNode node = nodesToProcess.removeFirst();
if (id.equals(node.getAutofillId())) {
return node;
}
for (int i = 0; i < node.getChildCount(); i++) {
nodesToProcess.addLast(node.getChildAt(i));
}
}
return null;
}
public static final Parcelable.Creator<FillContext> CREATOR =
new Parcelable.Creator<FillContext>() {
@Override

12
services/autofill/java/com/android/server/autofill/Session.java
View File

@@ -255,7 +255,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
final ViewNode node = nodes[i];
if (node == null) {
Slog.w(TAG, "fillStructureWithAllowedValues(): no node for " + viewState.id);
if (sVerbose) {
Slog.v(TAG, "fillStructureWithAllowedValues(): no node for " + viewState.id);
}
continue;
}
@@ -862,11 +864,9 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
final int numContexts = mContexts.size();
for (int i = 0; i < numContexts; i++) {
final FillContext context = mContexts.get(i);
// TODO: create a function that gets just one node so it doesn't create an array
// unnecessarily
final ViewNode[] nodes = context.findViewNodesByAutofillIds(id);
if (nodes != null) {
AutofillValue candidate = nodes[0].getAutofillValue();
final ViewNode node = context.findViewNodeByAutofillId(id);
if (node != null) {
final AutofillValue candidate = node.getAutofillValue();
if (sDebug) {
Slog.d(TAG, "getValueFromContexts(" + id + ") at " + i + ": " + candidate);
}