diff options
| author | Alexander Hills <ahills@google.com> | 2015-09-14 18:34:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-09-14 18:34:32 +0000 |
| commit | 6a261fd653eab7c8071290b71e3bfb3fe3598a49 (patch) | |
| tree | 5661fd4722998d3438ba6b8de4497af020a42cd9 /core/java/android/app | |
| parent | ae0b7ca9ad2e21853af06a68c02da068f748f8bd (diff) | |
| parent | 3d2337eeb5c8b28bace281d049c5ca8cd13c8b70 (diff) | |
| download | frameworks_base-6a261fd653eab7c8071290b71e3bfb3fe3598a49.zip frameworks_base-6a261fd653eab7c8071290b71e3bfb3fe3598a49.tar.gz frameworks_base-6a261fd653eab7c8071290b71e3bfb3fe3598a49.tar.bz2 | |
Merge "Cherry-pick system theme rebase to fix square UI on round watches" into cw-e-dev
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/ActivityThread.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java index da21eaf..fd88a05 100644 --- a/core/java/android/app/ActivityThread.java +++ b/core/java/android/app/ActivityThread.java @@ -4235,6 +4235,11 @@ public final class ActivityThread { configDiff = mConfiguration.updateFrom(config); config = applyCompatConfiguration(mCurDefaultDisplayDpi); + + final Theme systemTheme = getSystemContext().getTheme(); + if ((systemTheme.getChangingConfigurations() & configDiff) != 0) { + systemTheme.rebase(); + } } ArrayList<ComponentCallbacks2> callbacks = collectComponentCallbacks(false, config); |