Merge "Docs: Fixed typos in attribute descriptions." into udc-dev am: 838ba32966
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/24363296 Change-Id: Ie389694d02801009f6742ff290d868e880af029f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -3723,6 +3723,7 @@ public interface WindowManager extends ViewManager {
|
|||||||
* @see #ROTATION_ANIMATION_ROTATE
|
* @see #ROTATION_ANIMATION_ROTATE
|
||||||
* @see #ROTATION_ANIMATION_CROSSFADE
|
* @see #ROTATION_ANIMATION_CROSSFADE
|
||||||
* @see #ROTATION_ANIMATION_JUMPCUT
|
* @see #ROTATION_ANIMATION_JUMPCUT
|
||||||
|
* @see #ROTATION_ANIMATION_SEAMLESS
|
||||||
*/
|
*/
|
||||||
public int rotationAnimation = ROTATION_ANIMATION_ROTATE;
|
public int rotationAnimation = ROTATION_ANIMATION_ROTATE;
|
||||||
|
|
||||||
|
|||||||
@@ -2465,7 +2465,7 @@
|
|||||||
duration of the vector animation automatically. -->
|
duration of the vector animation automatically. -->
|
||||||
<attr name="windowSplashScreenAnimationDuration" format="integer"/>
|
<attr name="windowSplashScreenAnimationDuration" format="integer"/>
|
||||||
|
|
||||||
<!-- Place an drawable image in the bottom of the starting window, it can be used to
|
<!-- Place a drawable image in the bottom of the starting window. The image can be used to
|
||||||
represent the branding of the application. -->
|
represent the branding of the application. -->
|
||||||
<attr name="windowSplashScreenBrandingImage" format="reference"/>
|
<attr name="windowSplashScreenBrandingImage" format="reference"/>
|
||||||
<!-- Set a background behind the splash screen icon. This is useful if there is not enough
|
<!-- Set a background behind the splash screen icon. This is useful if there is not enough
|
||||||
@@ -3245,7 +3245,7 @@
|
|||||||
|
|
||||||
<!-- Specifies the id of a view for which this view serves as a label for
|
<!-- Specifies the id of a view for which this view serves as a label for
|
||||||
accessibility purposes. For example, a TextView before an EditText in
|
accessibility purposes. For example, a TextView before an EditText in
|
||||||
the UI usually specifies what infomation is contained in the EditText.
|
the UI usually specifies what information is contained in the EditText.
|
||||||
Hence, the TextView is a label for the EditText. -->
|
Hence, the TextView is a label for the EditText. -->
|
||||||
<attr name="labelFor" format="reference" />
|
<attr name="labelFor" format="reference" />
|
||||||
|
|
||||||
@@ -6787,7 +6787,7 @@
|
|||||||
edges of a bitmap when rotated. Default value is false. -->
|
edges of a bitmap when rotated. Default value is false. -->
|
||||||
<attr name="antialias" format="boolean" />
|
<attr name="antialias" format="boolean" />
|
||||||
<!-- Enables or disables bitmap filtering. Filtering is used when the bitmap is
|
<!-- Enables or disables bitmap filtering. Filtering is used when the bitmap is
|
||||||
shrunk or stretched to smooth its apperance. Default value is true. -->
|
shrunk or stretched to smooth its appearance. Default value is true. -->
|
||||||
<attr name="filter" format="boolean" />
|
<attr name="filter" format="boolean" />
|
||||||
<!-- Enables or disables dithering of the bitmap if the bitmap does not have the
|
<!-- Enables or disables dithering of the bitmap if the bitmap does not have the
|
||||||
same pixel configuration as the screen (for instance: a ARGB 8888 bitmap with
|
same pixel configuration as the screen (for instance: a ARGB 8888 bitmap with
|
||||||
|
|||||||
@@ -634,7 +634,7 @@
|
|||||||
able to return to it. -->
|
able to return to it. -->
|
||||||
<attr name="noHistory" format="boolean" />
|
<attr name="noHistory" format="boolean" />
|
||||||
|
|
||||||
<!-- Specify whether an acitivty's task state should always be maintained
|
<!-- Specify whether an activity's task state should always be maintained
|
||||||
by the system, or if it is allowed to reset the task to its initial
|
by the system, or if it is allowed to reset the task to its initial
|
||||||
state in certain situations.
|
state in certain situations.
|
||||||
|
|
||||||
@@ -731,15 +731,17 @@
|
|||||||
This is equivalent to calling {@link android.app.Activity#setVrModeEnabled} with the
|
This is equivalent to calling {@link android.app.Activity#setVrModeEnabled} with the
|
||||||
the given component name within the Activity that this attribute is set for.
|
the given component name within the Activity that this attribute is set for.
|
||||||
Declaring this will prevent the system from leaving VR mode during an Activity
|
Declaring this will prevent the system from leaving VR mode during an Activity
|
||||||
transtion from one VR activity to another. -->
|
transition from one VR activity to another. -->
|
||||||
<attr name="enableVrMode" format="string" />
|
<attr name="enableVrMode" format="string" />
|
||||||
|
|
||||||
<!-- Flag allowing the activity to specify which screen rotation animation
|
<!-- Flag that specifies the activity's preferred screen rotation animation.
|
||||||
it desires. Valid values are "rotate", "crossfade", and "jumpcut"
|
Valid values are "rotate", "crossfade", "jumpcut", and "seamless" as
|
||||||
as described in {@link android.view.WindowManager.LayoutParams#rotationAnimation}.
|
described in
|
||||||
Specifying your Rotation animation in the WindowManager.LayoutParams
|
{@link android.view.WindowManager.LayoutParams#rotationAnimation}.
|
||||||
may be racy with app startup and updattransitions occuring during application startup and thusly
|
Specifying your rotation animation in
|
||||||
the manifest attribute is preferred.
|
<code>WindowManager.LayoutParams</code> may be racy with app startup
|
||||||
|
and update transitions that occur during application startup; and so,
|
||||||
|
specify the animation in the manifest attribute.
|
||||||
-->
|
-->
|
||||||
<attr name="rotationAnimation">
|
<attr name="rotationAnimation">
|
||||||
<flag name="rotate" value= "0" />
|
<flag name="rotate" value= "0" />
|
||||||
@@ -830,7 +832,7 @@
|
|||||||
<enum name="singleInstance" value="3" />
|
<enum name="singleInstance" value="3" />
|
||||||
<!-- The activity can only be running as the root activity of the task, the first activity
|
<!-- The activity can only be running as the root activity of the task, the first activity
|
||||||
that created the task, and therefore there will only be one instance of this activity
|
that created the task, and therefore there will only be one instance of this activity
|
||||||
in a task. In constrast to the {@code singleTask} launch mode, this activity can be
|
in a task. In contrast to the {@code singleTask} launch mode, this activity can be
|
||||||
started in multiple instances in different tasks if the
|
started in multiple instances in different tasks if the
|
||||||
{@code FLAG_ACTIVITY_MULTIPLE_TASK} or {@code FLAG_ACTIVITY_NEW_DOCUMENT} is set.-->
|
{@code FLAG_ACTIVITY_MULTIPLE_TASK} or {@code FLAG_ACTIVITY_NEW_DOCUMENT} is set.-->
|
||||||
<enum name="singleInstancePerTask" value="4" />
|
<enum name="singleInstancePerTask" value="4" />
|
||||||
@@ -1328,7 +1330,7 @@
|
|||||||
<p>Such a document is any kind of item for which an application may want to
|
<p>Such a document is any kind of item for which an application may want to
|
||||||
maintain multiple simultaneous instances. Examples might be text files, web
|
maintain multiple simultaneous instances. Examples might be text files, web
|
||||||
pages, spreadsheets, or emails. Each such document will be in a separate
|
pages, spreadsheets, or emails. Each such document will be in a separate
|
||||||
task in the recent taskss list.
|
task in the recent tasks list.
|
||||||
|
|
||||||
<p>This attribute is equivalent to adding the flag {@link
|
<p>This attribute is equivalent to adding the flag {@link
|
||||||
android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT} to every Intent used to launch
|
android.content.Intent#FLAG_ACTIVITY_NEW_DOCUMENT} to every Intent used to launch
|
||||||
@@ -1771,7 +1773,7 @@
|
|||||||
</attr>
|
</attr>
|
||||||
|
|
||||||
<!-- Enable hardware memory tagging (ARM MTE) in this process.
|
<!-- Enable hardware memory tagging (ARM MTE) in this process.
|
||||||
When enabled, heap memory bugs like use-after-free and buffer overlow
|
When enabled, heap memory bugs like use-after-free and buffer overflow
|
||||||
are detected and result in an immediate ("sync" mode) or delayed ("async"
|
are detected and result in an immediate ("sync" mode) or delayed ("async"
|
||||||
mode) crash instead of a silent memory corruption. Sync mode, while slower,
|
mode) crash instead of a silent memory corruption. Sync mode, while slower,
|
||||||
provides enhanced bug reports including stack traces at the time of allocation
|
provides enhanced bug reports including stack traces at the time of allocation
|
||||||
|
|||||||
Reference in New Issue
Block a user