diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2016-04-01 16:41:41 -0700 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2016-04-04 15:24:48 -0700 |
| commit | 3ad1b4899fcf38de92b6ac8d84e55a738f0baad9 (patch) | |
| tree | 421e00be3405c82394fbb864040262b4c278211d /core/java/android/view/ContextThemeWrapper.java | |
| parent | c83ce39a8e22b2df75cdfcb09b032d0b2244a5ca (diff) | |
Fix issue with overridden configuration in onConfigurationChanged
When using applyOverrideConfiguration, subsequent callbacks to
onConfigurationChanged didn't take into account the locally overridden
configuration. This patches the incoming configuration to match
what is expected by the application.
Bug:27644297
Change-Id: I3a090e9862a56470d999aa0aa4d5bae29f533a11
Diffstat (limited to 'core/java/android/view/ContextThemeWrapper.java')
| -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. |