Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a42f67c4 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix some config issues with sysui" into oc-dr1-dev am: f636e3fb 

am: f6219fa8

Change-Id: I664f79cf1b63edb083773b3cd283fec4d0a5e9bb
parents 50f3a1e0 f6219fa8

packages/SettingsLib/src/com/android/settingslib/applications/InterestingConfigChanges.java

+2 −1
Original line number Diff line number Diff line
@@ -36,7 +36,8 @@ public class InterestingConfigChanges { 
    }



    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;

packages/SystemUI/src/com/android/systemui/statusbar/phone/StatusBar.java

+1 −1
Original line number Diff line number Diff line
@@ -3770,7 +3770,7 @@ public class StatusBar extends SystemUI implements DemoMode, 


    // 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