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

Make LD stateful / opacity management look more like DC

Browse Source 
Some initial cleanup before making changes to either class.

Test: n/a, refactoring only
Bug: 33124798
Change-Id: Idf0328bcc6de72b694ca7b35122ecad845cf1c4b
This commit is contained in:
Alan Viverette
2016-11-28 14:55:18 -05:00
parent cd3672586e
commit eb7277590a
3 changed files with 67 additions and 68 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
graphics/java/android/graphics/drawable/DrawableContainer.java
View File

@@ -1128,8 +1128,6 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
createAllFutures();
mCheckedOpacity = true;
final int N = mNumChildren;
final Drawable[] drawables = mDrawables;
int op = (N > 0) ? drawables[0].getOpacity() : PixelFormat.TRANSPARENT;
@@ -1138,6 +1136,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
}
mOpacity = op;
mCheckedOpacity = true;
return op;
}
@@ -1148,19 +1147,19 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
createAllFutures();
mCheckedStateful = true;
final int N = mNumChildren;
final Drawable[] drawables = mDrawables;
boolean isStateful = false;
for (int i = 0; i < N; i++) {
if (drawables[i].isStateful()) {
mStateful = true;
return true;
isStateful = true;
break;
}
}
mStateful = false;
return false;
mStateful = isStateful;
mCheckedStateful = true;
return isStateful;
}
public void growArray(int oldSize, int newSize) {