diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2020-09-15 00:13:08 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-09-15 00:13:08 +0000 |
| commit | 487d3942962564b742db6ea5d944285a8d734301 (patch) | |
| tree | 93af79b8276ecce6054dee546a5a96ec1c4e68e1 /services/accessibility | |
| parent | bc93881957cd39e810aa67bea67ffe6a67da9c2a (diff) | |
| parent | da7478b570ba291103a2b37ca33668f81adf87ad (diff) | |
Merge changes from topic "sep11" am: c0b288133a am: 69e6f07347 am: 741c0a78cc am: da7478b570
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1426195
Change-Id: I79488866c538bf9e76d0a6429e30262978f6fdab
Diffstat (limited to 'services/accessibility')
3 files changed, 3 insertions, 3 deletions
diff --git a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java index d15c60b9501d..fa29ce8474f8 100644 --- a/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java +++ b/services/accessibility/java/com/android/server/accessibility/AccessibilityWindowManager.java @@ -1338,7 +1338,7 @@ public class AccessibilityWindowManager { mTouchInteractionInProgress = false; // We want to set the active window to be current immediately // after the user has stopped touching the screen since if the - // user types with the IME he should get a feedback for the + // user types with the IME they should get a feedback for the // letter typed in the text view which is in the input focused // window. Note that we always deliver hover accessibility events // (they are a result of user touching the screen) so change of diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java b/services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java index e9c70c60a322..5c15214284f0 100644 --- a/services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java +++ b/services/accessibility/java/com/android/server/accessibility/gestures/GestureManifold.java @@ -201,7 +201,7 @@ class GestureManifold implements GestureMatcher.StateChangeListener { boolean onMotionEvent(MotionEvent event, MotionEvent rawEvent, int policyFlags) { if (mState.isClear()) { if (event.getActionMasked() == MotionEvent.ACTION_DOWN) { - // Sanity safeguard: if touch state is clear, then matchers should always be clear + // Validity safeguard: if touch state is clear, then matchers should always be clear // before processing the next down event. clear(); } else { diff --git a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java index fbc986bdd730..6074ac94faf3 100644 --- a/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java +++ b/services/accessibility/java/com/android/server/accessibility/gestures/TouchExplorer.java @@ -637,7 +637,7 @@ public class TouchExplorer extends BaseEventStreamTransformation } // If the user is touch exploring the second pointer may be // performing a double tap to activate an item without need - // for the user to lift his exploring finger. + // for the user to lift their exploring finger. // It is *important* to use the distance traveled by the pointers // on the screen which may or may not be magnified. final float deltaX = |