diff options
author | Alan Viverette <alanv@google.com> | 2015-05-05 16:50:27 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-05 16:50:29 +0000 |
commit | 261208e002775fe9a9f4e79e9f70b41852cfbe60 (patch) | |
tree | 8892fb65af63b32037a23cebd66081e2a944cbce /api | |
parent | 28a516280a59a81aeecbf4a68057019d59feb872 (diff) | |
parent | c1d527926e1c82828e42bdc0c7abf50f6decc0a7 (diff) | |
download | frameworks_base-261208e002775fe9a9f4e79e9f70b41852cfbe60.zip frameworks_base-261208e002775fe9a9f4e79e9f70b41852cfbe60.tar.gz frameworks_base-261208e002775fe9a9f4e79e9f70b41852cfbe60.tar.bz2 |
Merge "Add API for obtaining changing configurations bitmask from Theme" into mnc-dev
Diffstat (limited to 'api')
-rw-r--r-- | api/current.txt | 1 | ||||
-rw-r--r-- | api/system-current.txt | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index e3bb0b8..c8057db 100644 --- a/api/current.txt +++ b/api/current.txt @@ -9828,6 +9828,7 @@ package android.content.res { public final class Resources.Theme { method public void applyStyle(int, boolean); method public void dump(int, java.lang.String, java.lang.String); + method public int getChangingConfigurations(); method public android.graphics.drawable.Drawable getDrawable(int) throws android.content.res.Resources.NotFoundException; method public android.content.res.Resources getResources(); method public android.content.res.TypedArray obtainStyledAttributes(int[]); diff --git a/api/system-current.txt b/api/system-current.txt index 535bfc7..5222a03 100644 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -10122,6 +10122,7 @@ package android.content.res { public final class Resources.Theme { method public void applyStyle(int, boolean); method public void dump(int, java.lang.String, java.lang.String); + method public int getChangingConfigurations(); method public android.graphics.drawable.Drawable getDrawable(int) throws android.content.res.Resources.NotFoundException; method public android.content.res.Resources getResources(); method public android.content.res.TypedArray obtainStyledAttributes(int[]); |