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

Merge "Ensure all Java-side usages of config flags are using Java flags" into nyc-dev

Browse Source
This commit is contained in:
Alan Viverette
2016-03-14 15:01:50 +00:00
committed by Android (Google) Code Review
parent 031d15dd70 ac85f90466
commit 781fbf28c7
28 changed files with 219 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -17,6 +17,7 @@
package android.graphics.drawable;
import android.annotation.NonNull;
import android.content.pm.ActivityInfo.Config;
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.content.res.Resources.Theme;
@@ -87,7 +88,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
}
@Override
public int getChangingConfigurations() {
public @Config int getChangingConfigurations() {
return super.getChangingConfigurations()
| mDrawableContainerState.getChangingConfigurations();
}
@@ -649,8 +650,8 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
Resources mSourceRes;
int mDensity = DisplayMetrics.DENSITY_DEFAULT;
int mChangingConfigurations;
int mChildrenChangingConfigurations;
@Config int mChangingConfigurations;
@Config int mChildrenChangingConfigurations;
SparseArray<ConstantState> mDrawableFutures;
Drawable[] mDrawables;
@@ -781,7 +782,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
}
@Override
public int getChangingConfigurations() {
public @Config int getChangingConfigurations() {
return mChangingConfigurations | mChildrenChangingConfigurations;
}