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

Commit 635030ba authored by Danny Baumann's avatar Danny Baumann Committed by David van Tonder
Browse files

Fix multi-user issues. 

Change-Id: I44d190f60e87326ab3282c898d94ecc88778f2ab
parent fd7cd5cd

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

+19 −14
Original line number Diff line number Diff line
@@ -2876,14 +2876,18 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 


    private void updateSettings() {

        ContentResolver resolver = mContext.getContentResolver();

        //XXX: multi-user correct?

        boolean autoBrightness = Settings.System.getInt(

                resolver, Settings.System.SCREEN_BRIGHTNESS_MODE, 0) ==

                Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC;

        mBrightnessControl = !autoBrightness && Settings.System.getInt(

                resolver, Settings.System.STATUS_BAR_BRIGHTNESS_CONTROL, 0) == 1;



        int batteryStyle = Settings.System.getInt(resolver, Settings.System.STATUS_BAR_BATTERY, 0);

        int autoBrightnessSetting = Settings.System.getIntForUser(

                resolver, Settings.System.SCREEN_BRIGHTNESS_MODE, 0, mCurrentUserId);



        if (autoBrightnessSetting == Settings.System.SCREEN_BRIGHTNESS_MODE_AUTOMATIC) {

            mBrightnessControl = false;

        } else {

            mBrightnessControl = Settings.System.getIntForUser(resolver,

                    Settings.System.STATUS_BAR_BRIGHTNESS_CONTROL, 0, mCurrentUserId) == 1;

        }



        int batteryStyle = Settings.System.getIntForUser(resolver,

                Settings.System.STATUS_BAR_BATTERY, 0, mCurrentUserId);

        BatteryMeterMode mode = BatteryMeterMode.BATTERY_METER_ICON_PORTRAIT;

        switch (batteryStyle) {

            case 2:
@@ -2902,8 +2906,8 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
                break;

        }



        boolean showPercent = Settings.System.getInt(resolver,

                Settings.System.STATUS_BAR_BATTERY_SHOW_PERCENT, 0) == 1;

        boolean showPercent = Settings.System.getIntForUser(resolver,

                Settings.System.STATUS_BAR_BATTERY_SHOW_PERCENT, 0, mCurrentUserId) == 1;



        mBatteryView.setMode(mode);

        mBatteryController.onBatteryMeterModeChanged(mode);
@@ -2915,12 +2919,13 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode { 
        mDockBatteryView.setShowPercent(showPercent);

        mDockBatteryController.onBatteryMeterShowPercent(showPercent);



        mClockEnabled = Settings.System.getInt(resolver,

                Settings.System.STATUS_BAR_CLOCK, 1) != 0;

        mClockEnabled = Settings.System.getIntForUser(resolver,

                Settings.System.STATUS_BAR_CLOCK, 1, mCurrentUserId) != 0;

        updateClockVisibility();



        int signalStyle = Settings.System.getInt(resolver,

                Settings.System.STATUS_BAR_SIGNAL_TEXT, SignalClusterView.STYLE_NORMAL);

        int signalStyle = Settings.System.getIntForUser(resolver,

                Settings.System.STATUS_BAR_SIGNAL_TEXT,

                SignalClusterView.STYLE_NORMAL, mCurrentUserId);

        mSignalClusterView.setStyle(signalStyle);

        mSignalTextView.setStyle(signalStyle);

    }