diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-04-05 02:22:50 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-04-05 02:22:52 +0000 |
| commit | a149c42071197a7759a652accb399bc58ed62bcd (patch) | |
| tree | 0ecf6016b1ef1e21e34ff8d919f375c463df42ba /core/java/android/view | |
| parent | 5169c62c6c0acbf9d5a36a90233e7ba2e9532e58 (diff) | |
| parent | 3ad1b4899fcf38de92b6ac8d84e55a738f0baad9 (diff) | |
Merge "Fix issue with overridden configuration in onConfigurationChanged" into nyc-dev
Diffstat (limited to 'core/java/android/view')
| -rw-r--r-- | core/java/android/view/ContextThemeWrapper.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/view/ContextThemeWrapper.java b/core/java/android/view/ContextThemeWrapper.java index 4888877cb28b..86318e91b885 100644 --- a/core/java/android/view/ContextThemeWrapper.java +++ b/core/java/android/view/ContextThemeWrapper.java @@ -101,6 +101,15 @@ public class ContextThemeWrapper extends ContextWrapper { mOverrideConfiguration = new Configuration(overrideConfiguration); } + /** + * Used by ActivityThread to apply the overridden configuration to onConfigurationChange + * callbacks. + * @hide + */ + public Configuration getOverrideConfiguration() { + return mOverrideConfiguration; + } + @Override public AssetManager getAssets() { // Ensure we're returning assets with the correct configuration. |