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

Merge "docs: fix typos" into qt-dev am: d732cbb7bd am: 77514bd077

Browse Source 
am: 208e73ca76

Change-Id: I492eb05a7292f17df50190ae5325e5c99bb0407e
This commit is contained in:
Joshua Baxter
2019-11-06 13:57:03 -08:00
committed by android-build-merger
parent 9d80afbcbb 208e73ca76
commit fc66e118db
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/view/View.java
View File

@@ -492,7 +492,7 @@ import java.util.function.Predicate;
* *
* <p> * <p>
* To initiate a layout, call {@link #requestLayout}. This method is typically * To initiate a layout, call {@link #requestLayout}. This method is typically
* called by a view on itself when it believes that is can no longer fit within * called by a view on itself when it believes that it can no longer fit within
* its current bounds. * its current bounds.
* </p> * </p>
* *
@@ -2850,7 +2850,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
/** /**
* Default for the root view. The gravity determines the text alignment, ALIGN_NORMAL, * Default for the root view. The gravity determines the text alignment, ALIGN_NORMAL,
* ALIGN_CENTER, or ALIGN_OPPOSITE, which are relative to each paragraph’s text direction. * ALIGN_CENTER, or ALIGN_OPPOSITE, which are relative to each paragraph's text direction.
* *
* Use with {@link #setTextAlignment(int)} * Use with {@link #setTextAlignment(int)}
*/ */
@@ -2878,7 +2878,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
public static final int TEXT_ALIGNMENT_CENTER = 4; public static final int TEXT_ALIGNMENT_CENTER = 4;
/** /**
* Align to the start of the view, which is ALIGN_LEFT if the view’s resolved * Align to the start of the view, which is ALIGN_LEFT if the view's resolved
* layoutDirection is LTR, and ALIGN_RIGHT otherwise. * layoutDirection is LTR, and ALIGN_RIGHT otherwise.
* *
* Use with {@link #setTextAlignment(int)} * Use with {@link #setTextAlignment(int)}
@@ -2886,7 +2886,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
public static final int TEXT_ALIGNMENT_VIEW_START = 5; public static final int TEXT_ALIGNMENT_VIEW_START = 5;
/** /**
* Align to the end of the view, which is ALIGN_RIGHT if the view’s resolved * Align to the end of the view, which is ALIGN_RIGHT if the view's resolved
* layoutDirection is LTR, and ALIGN_LEFT otherwise. * layoutDirection is LTR, and ALIGN_LEFT otherwise.
* *
* Use with {@link #setTextAlignment(int)} * Use with {@link #setTextAlignment(int)}
@@ -3689,7 +3689,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
* if the user swipes from the top of the screen. * if the user swipes from the top of the screen.
* <p>When system bars are hidden in immersive mode, they can be revealed temporarily with * <p>When system bars are hidden in immersive mode, they can be revealed temporarily with
* system gestures, such as swiping from the top of the screen. These transient system bars * system gestures, such as swiping from the top of the screen. These transient system bars
* will overlay app’s content, may have some degree of transparency, and will automatically * will overlay app's content, may have some degree of transparency, and will automatically
* hide after a short timeout. * hide after a short timeout.
* </p><p>Since this flag is a modifier for {@link #SYSTEM_UI_FLAG_FULLSCREEN} and * </p><p>Since this flag is a modifier for {@link #SYSTEM_UI_FLAG_FULLSCREEN} and
* {@link #SYSTEM_UI_FLAG_HIDE_NAVIGATION}, it only has an effect when used in combination * {@link #SYSTEM_UI_FLAG_HIDE_NAVIGATION}, it only has an effect when used in combination
@@ -10293,7 +10293,7 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
} }
/** /**
* Gets the unique identifier of the window in which this View reseides. * Gets the unique identifier of the window in which this View resides.
* *
* @return The window accessibility id. * @return The window accessibility id.
* *