Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 64a23c98 authored Jan 30, 2023 by Treehugger Robot Committed by Automerger Merge Worker Jan 30, 2023

Merge "Fix "form/from" typos in comments" am: c66a3908

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/2392792

Change-Id: Id371845b254598cdc40f1a3464ac980c04b52e84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents f852fd96 c66a3908

core/java/android/view/AccessibilityInteractionController.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1502,7 +1502,7 @@ public final class AccessibilityInteractionController {
	parent = provider.createAccessibilityNodeInfo(virtualDescendantId);		parent = provider.createAccessibilityNodeInfo(virtualDescendantId);
	if (parent == null) {		if (parent == null) {
	// Going up the parent relation we found a null predecessor,		// 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();		final int currentResultSize = outInfos.size();
	for (int i = currentResultSize - 1; i >= initialResultSize; i--) {		for (int i = currentResultSize - 1; i >= initialResultSize; i--) {
	outInfos.remove(i);		outInfos.remove(i);

core/java/android/widget/AbsListView.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -463,7 +463,7 @@ public abstract class AbsListView extends AdapterView<ListAdapter> implements Te
	AbsPositionScroller mPositionScroller;		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.		* of the currently selected view. Used to save and restore state.
	*/		*/
	int mSelectedTop = 0;		int mSelectedTop = 0;

core/java/android/window/TaskFragmentTransaction.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -126,7 +126,7 @@ public final class TaskFragmentTransaction implements Parcelable {
	/** Change type: the status of the TaskFragment is changed. */		/** Change type: the status of the TaskFragment is changed. */
	public static final int TYPE_TASK_FRAGMENT_INFO_CHANGED = 2;		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;		public static final int TYPE_TASK_FRAGMENT_VANISHED = 3;

	/** Change type: the status of the parent leaf Task is changed. */		/** Change type: the status of the parent leaf Task is changed. */

core/java/com/android/internal/util/TraceBuffer.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -193,7 +193,7 @@ public class TraceBuffer<P, S extends P, T extends P> {
	}		}

	/**		/**
	* Removes all elements form the buffer		* Removes all elements from the buffer
	*/		*/
	public void resetBuffer() {		public void resetBuffer() {
	synchronized (mBufferLock) {		synchronized (mBufferLock) {

core/java/com/android/internal/widget/RecyclerView.java

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -10087,7 +10087,7 @@ public class RecyclerView extends ViewGroup implements ScrollingView, NestedScro
	static final int FLAG_IGNORE = 1 << 7;		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.		* action when we need to remove it or add it back.
	*/		*/
	static final int FLAG_TMP_DETACHED = 1 << 8;		static final int FLAG_TMP_DETACHED = 1 << 8;