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

Merge "Fix typos"

Browse Source
This commit is contained in:
Pablo Gamito
2022-02-14 14:55:10 +00:00
committed by Android (Google) Code Review
parent d2101ad401 599f535b1b
commit c533e1070c
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/java/android/view/animation/Transformation.java
View File

@@ -158,7 +158,7 @@ public class Transformation {
}
/**
* @return The 3x3 Matrix representing the trnasformation to apply to the
* @return The 3x3 Matrix representing the transformation to apply to the
* coordinates of the object being animated
*/
public Matrix getMatrix() {
@@ -167,7 +167,7 @@ public class Transformation {
/**
* Sets the degree of transparency
* @param alpha 1.0 means fully opaqe and 0.0 means fully transparent
* @param alpha 1.0 means fully opaque and 0.0 means fully transparent
*/
public void setAlpha(@FloatRange(from=0.0, to=1.0) float alpha) {
mAlpha = alpha;

2
core/java/android/window/TransitionInfo.java
View File

@@ -650,7 +650,7 @@ public final class TransitionInfo implements Parcelable {
return options;
}
public static AnimationOptions makeThumnbnailAnimOptions(HardwareBuffer srcThumb,
public static AnimationOptions makeThumbnailAnimOptions(HardwareBuffer srcThumb,
int startX, int startY, boolean scaleUp) {
AnimationOptions options = new AnimationOptions(
scaleUp ? ANIM_THUMBNAIL_SCALE_UP : ANIM_THUMBNAIL_SCALE_DOWN);

2
services/core/java/com/android/server/wm/ActivityRecord.java
View File

@@ -4536,7 +4536,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
pendingOptions.getStartX(), pendingOptions.getStartY(),
pendingOptions.getAnimationStartedListener(),
scaleUp);
options = AnimationOptions.makeThumnbnailAnimOptions(buffer,
options = AnimationOptions.makeThumbnailAnimOptions(buffer,
pendingOptions.getStartX(), pendingOptions.getStartY(), scaleUp);
startCallback = pendingOptions.getAnimationStartedListener();
if (intent.getSourceBounds() == null && buffer != null) {