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

Merge "Disable inline suggestions for afservice when talkback is enabled." into sc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2021-07-29 06:56:35 +00:00
committed by Android (Google) Code Review
parent 4e7b1128a4 364a5225be
commit fda724a5be
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -96,6 +96,7 @@ import android.util.Slog;
import android.util.SparseArray; import android.util.SparseArray;
import android.util.TimeUtils; import android.util.TimeUtils;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.accessibility.AccessibilityManager;
import android.view.autofill.AutofillId; import android.view.autofill.AutofillId;
import android.view.autofill.AutofillManager; import android.view.autofill.AutofillManager;
import android.view.autofill.AutofillManager.SmartSuggestionMode; import android.view.autofill.AutofillManager.SmartSuggestionMode;
@@ -346,6 +347,8 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
*/ */
private final AssistDataReceiverImpl mAssistReceiver = new AssistDataReceiverImpl(); private final AssistDataReceiverImpl mAssistReceiver = new AssistDataReceiverImpl();
private final AccessibilityManager mAccessibilityManager;
void onSwitchInputMethodLocked() { void onSwitchInputMethodLocked() {
// One caveat is that for the case where the focus is on a field for which regular autofill // One caveat is that for the case where the focus is on a field for which regular autofill
// returns null, and augmented autofill is triggered, and then the user switches the input // returns null, and augmented autofill is triggered, and then the user switches the input
@@ -458,10 +461,15 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
return; return;
} }
// If a11y touch exploration is enabled, then we do not send an inline fill request
// to the regular af service, because dropdown UI is easier to use.
if (!mAccessibilityManager.isTouchExplorationEnabled()) {
mPendingFillRequest = new FillRequest(mPendingFillRequest.getId(), mPendingFillRequest = new FillRequest(mPendingFillRequest.getId(),
mPendingFillRequest.getFillContexts(), mPendingFillRequest.getClientState(), mPendingFillRequest.getFillContexts(),
mPendingFillRequest.getClientState(),
mPendingFillRequest.getFlags(), mPendingInlineSuggestionsRequest); mPendingFillRequest.getFlags(), mPendingInlineSuggestionsRequest);
} }
}
mRemoteFillService.onFillRequest(mPendingFillRequest); mRemoteFillService.onFillRequest(mPendingFillRequest);
mPendingInlineSuggestionsRequest = null; mPendingInlineSuggestionsRequest = null;
@@ -889,6 +897,7 @@ final class Session implements RemoteFillService.FillServiceCallbacks, ViewState
mRemoteFillService = serviceComponentName == null ? null mRemoteFillService = serviceComponentName == null ? null
: new RemoteFillService(context, serviceComponentName, userId, this, : new RemoteFillService(context, serviceComponentName, userId, this,
bindInstantServiceAllowed); bindInstantServiceAllowed);
mAccessibilityManager = AccessibilityManager.getInstance(context);
mActivityToken = activityToken; mActivityToken = activityToken;
mHasCallback = hasCallback; mHasCallback = hasCallback;
mUiLatencyHistory = uiLatencyHistory; mUiLatencyHistory = uiLatencyHistory;