| commit | f6219fa804ed4706b49b9aa0baf11c4245c28ea2 | [log] [tgz] |
|---|---|---|
| author | Jason Monk <jmonk@google.com> | Thu Jul 06 13:20:18 2017 +0000 |
| committer | android-build-merger <android-build-merger@google.com> | Thu Jul 06 13:20:18 2017 +0000 |
| tree | 096504189b2cd55c774c23d9e75dacfd6b1bea1a | |
| parent | c4b8015b1a97a771e023418811e08d37b191128a [diff] | |
| parent | f636e3fb52cf047c878d66454fa910cab9f086e1 [diff] |
Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb52 Change-Id: Ib9b38c8eb8c6452e7d12f2ced2b499292c000277
diff --git a/packages/SettingsLib/src/com/android/settingslib/applications/InterestingConfigChanges.java b/packages/SettingsLib/src/com/android/settingslib/applications/InterestingConfigChanges.java index e4e0f7f..c4cbc2b 100644 --- a/packages/SettingsLib/src/com/android/settingslib/applications/InterestingConfigChanges.java +++ b/packages/SettingsLib/src/com/android/settingslib/applications/InterestingConfigChanges.java
@@ -36,7 +36,8 @@ } public boolean applyNewConfig(Resources res) { - int configChanges = mLastConfiguration.updateFrom(res.getConfiguration()); + int configChanges = mLastConfiguration.updateFrom( + Configuration.generateDelta(mLastConfiguration, res.getConfiguration())); boolean densityChanged = mLastDensity != res.getDisplayMetrics().densityDpi; if (densityChanged || (configChanges & (mFlags)) != 0) { mLastDensity = res.getDisplayMetrics().densityDpi;
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java index f6fab44..4ad6468 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java
@@ -3759,7 +3759,7 @@ // SystemUIService notifies SystemBars of configuration changes, which then calls down here @Override - protected void onConfigurationChanged(Configuration newConfig) { + public void onConfigChanged(Configuration newConfig) { updateResources(); updateDisplaySize(); // populates mDisplayMetrics