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

Merge "Don't consider resources < 0 as invalid" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-04-23 18:14:32 +00:00
committed by Android (Google) Code Review
parent 888a82fdb3 64c57a8c96
commit 39b3e46607
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
services/core/java/com/android/server/wm/AppTransition.java
View File

@@ -82,6 +82,7 @@ import android.app.ActivityManager;
import android.content.ComponentName;
import android.content.Context;
import android.content.res.Configuration;
import android.content.res.ResourceId;
import android.graphics.Bitmap;
import android.graphics.Canvas;
import android.graphics.Color;
@@ -538,25 +539,25 @@ public class AppTransition implements Dump {
}
Animation loadAnimationAttr(LayoutParams lp, int animAttr, int transit) {
int anim = 0;
int resId = ResourceId.ID_NULL;
Context context = mContext;
if (animAttr >= 0) {
AttributeCache.Entry ent = getCachedAnimations(lp);
if (ent != null) {
context = ent.context;
anim = ent.array.getResourceId(animAttr, 0);
resId = ent.array.getResourceId(animAttr, 0);
}
}
anim = updateToTranslucentAnimIfNeeded(anim, transit);
if (anim != 0) {
return AnimationUtils.loadAnimation(context, anim);
resId = updateToTranslucentAnimIfNeeded(resId, transit);
if (ResourceId.isValid(resId)) {
return AnimationUtils.loadAnimation(context, resId);
}
return null;
}
Animation loadAnimationRes(LayoutParams lp, int resId) {
Context context = mContext;
if (resId >= 0) {
if (ResourceId.isValid(resId)) {
AttributeCache.Entry ent = getCachedAnimations(lp);
if (ent != null) {
context = ent.context;
@@ -567,18 +568,12 @@ public class AppTransition implements Dump {
}
private Animation loadAnimationRes(String packageName, int resId) {
int anim = 0;
Context context = mContext;
if (resId >= 0) {
if (ResourceId.isValid(resId)) {
AttributeCache.Entry ent = getCachedAnimations(packageName, resId);
if (ent != null) {
context = ent.context;
anim = resId;
return AnimationUtils.loadAnimation(ent.context, resId);
}
}
if (anim != 0) {
return AnimationUtils.loadAnimation(context, anim);
}
return null;
}