summaryrefslogtreecommitdiff
path: root/core/java/android/widget/ScrollView.java
diff options
context:
space:
mode:
authorJeff Sharkey <jsharkey@android.com>2020-09-11 14:57:21 -0600
committerJeff Sharkey <jsharkey@android.com>2020-09-14 10:00:07 -0600
commita8cec413b65bfc3ea23575b34eb983c20944491b (patch)
tree45b6c2cae640a384763a67a4fa2f805586423191 /core/java/android/widget/ScrollView.java
parent16dd960d6f43281cd41f4c35e086eb4eebfa8254 (diff)
Update language to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference Test: none Bug: 168334533 Exempt-From-Owner-Approval: docs updates Change-Id: I245b8d9cac722da76ea67983738a3cbb9deb68df
Diffstat (limited to 'core/java/android/widget/ScrollView.java')
-rw-r--r--core/java/android/widget/ScrollView.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/widget/ScrollView.java b/core/java/android/widget/ScrollView.java
index 3847d6b2a613..b44b8c222fac 100644
--- a/core/java/android/widget/ScrollView.java
+++ b/core/java/android/widget/ScrollView.java
@@ -133,7 +133,7 @@ public class ScrollView extends FrameLayout {
/**
* True if the user is currently dragging this ScrollView around. This is
* not the same as 'is being flinged', which can be checked by
- * mScroller.isFinished() (flinging begins when the user lifts his finger).
+ * mScroller.isFinished() (flinging begins when the user lifts their finger).
*/
@UnsupportedAppUsage
private boolean mIsBeingDragged = false;
@@ -593,7 +593,7 @@ public class ScrollView extends FrameLayout {
/*
* Shortcut the most recurring case: the user is in the dragging
- * state and he is moving his finger. We want to intercept this
+ * state and they is moving their finger. We want to intercept this
* motion.
*/
final int action = ev.getAction();
@@ -616,7 +616,7 @@ public class ScrollView extends FrameLayout {
case MotionEvent.ACTION_MOVE: {
/*
* mIsBeingDragged == false, otherwise the shortcut would have caught it. Check
- * whether the user has moved far enough from his original down touch.
+ * whether the user has moved far enough from their original down touch.
*/
/*