diff --git a/core/java/android/view/AccessibilityInteractionController.java b/core/java/android/view/AccessibilityInteractionController.java index 23e1505e1a4c..62211c42f397 100644 --- a/core/java/android/view/AccessibilityInteractionController.java +++ b/core/java/android/view/AccessibilityInteractionController.java @@ -1502,7 +1502,7 @@ public final class AccessibilityInteractionController { parent = provider.createAccessibilityNodeInfo(virtualDescendantId); if (parent == null) { // Going up the parent relation we found a null predecessor, - // so remove these disconnected nodes form the result. + // so remove these disconnected nodes from the result. final int currentResultSize = outInfos.size(); for (int i = currentResultSize - 1; i >= initialResultSize; i--) { outInfos.remove(i); diff --git a/core/java/android/widget/AbsListView.java b/core/java/android/widget/AbsListView.java index 0b0bfb1ddbe9..26b021490357 100644 --- a/core/java/android/widget/AbsListView.java +++ b/core/java/android/widget/AbsListView.java @@ -463,7 +463,7 @@ public abstract class AbsListView extends AdapterView implements Te AbsPositionScroller mPositionScroller; /** - * The offset in pixels form the top of the AdapterView to the top + * The offset in pixels from the top of the AdapterView to the top * of the currently selected view. Used to save and restore state. */ int mSelectedTop = 0; diff --git a/core/java/android/window/TaskFragmentTransaction.java b/core/java/android/window/TaskFragmentTransaction.java index a8216069bd53..2de3dfdd803c 100644 --- a/core/java/android/window/TaskFragmentTransaction.java +++ b/core/java/android/window/TaskFragmentTransaction.java @@ -126,7 +126,7 @@ public final class TaskFragmentTransaction implements Parcelable { /** Change type: the status of the TaskFragment is changed. */ public static final int TYPE_TASK_FRAGMENT_INFO_CHANGED = 2; - /** Change type: the TaskFragment is removed form the hierarchy. */ + /** Change type: the TaskFragment is removed from the hierarchy. */ public static final int TYPE_TASK_FRAGMENT_VANISHED = 3; /** Change type: the status of the parent leaf Task is changed. */ diff --git a/core/java/com/android/internal/util/TraceBuffer.java b/core/java/com/android/internal/util/TraceBuffer.java index fe8a59e160bd..bfcd65d4f277 100644 --- a/core/java/com/android/internal/util/TraceBuffer.java +++ b/core/java/com/android/internal/util/TraceBuffer.java @@ -193,7 +193,7 @@ public class TraceBuffer { } /** - * Removes all elements form the buffer + * Removes all elements from the buffer */ public void resetBuffer() { synchronized (mBufferLock) { diff --git a/core/java/com/android/internal/widget/RecyclerView.java b/core/java/com/android/internal/widget/RecyclerView.java index e27557a0ef90..4a74d5fa53dc 100644 --- a/core/java/com/android/internal/widget/RecyclerView.java +++ b/core/java/com/android/internal/widget/RecyclerView.java @@ -10087,7 +10087,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro static final int FLAG_IGNORE = 1 << 7; /** - * When the View is detached form the parent, we set this flag so that we can take correct + * When the View is detached from the parent, we set this flag so that we can take correct * action when we need to remove it or add it back. */ static final int FLAG_TMP_DETACHED = 1 << 8; diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java index e46bf522acff..7c21ffb7869f 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationContentView.java @@ -1049,7 +1049,7 @@ public class NotificationContentView extends FrameLayout implements Notification } /** - * @return one of the static enum types in this view, calculated form the current state + * @return one of the static enum types in this view, calculated from the current state */ public int calculateVisibleType() { if (mUserExpanding) { diff --git a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java index a94e4b9b492d..86303c1f22d1 100644 --- a/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java +++ b/services/companion/java/com/android/server/companion/CompanionDeviceManagerService.java @@ -1094,7 +1094,7 @@ public class CompanionDeviceManagerService extends SystemService { } /** - * Remove the revoked association form the cache and also remove the uid form the map if + * Remove the revoked association from the cache and also remove the uid from the map if * there are other associations with the same package still pending for role holder removal. * * @see #mRevokedAssociationsPendingRoleHolderRemoval @@ -1113,7 +1113,7 @@ public class CompanionDeviceManagerService extends SystemService { final boolean shouldKeepUidForRemoval = any( getPendingRoleHolderRemovalAssociationsForUser(userId), ai -> packageName.equals(ai.getPackageName())); - // Do not remove the uid form the map since other associations with + // Do not remove the uid from the map since other associations with // the same packageName still pending for role holder removal. if (!shouldKeepUidForRemoval) { mUidsPendingRoleHolderRemoval.remove(uid); diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java index 2507a8d5af3a..129a48f6f193 100644 --- a/services/core/java/com/android/server/wm/RootWindowContainer.java +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java @@ -2284,7 +2284,7 @@ class RootWindowContainer extends WindowContainer } if (rootTask.getDisplayArea().isTopRootTask(rootTask) && topRunningActivity.isState(RESUMED)) { - // Kick off any lingering app transitions form the MoveTaskToFront + // Kick off any lingering app transitions from the MoveTaskToFront // operation, but only consider the top task and root-task on that // display. rootTask.executeAppTransition(targetOptions);