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

Commit 163009b8 authored by David van Tonder's avatar David van Tonder Committed by Gerrit Code Review
Browse files

Merge "Fix multi-user behaviour for system UI settings (1/2)" into cm-10.1

parents 05a03451 a0121867

core/java/android/provider/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -2506,6 +2506,7 @@ public final class Settings { 


        /**

         * Torch state (flashlight)

         * FIXME: move me to global state

         * @hide

         */

        public static final String TORCH_STATE = "torch_state";

packages/SystemUI/src/com/android/systemui/quicksettings/AlarmTile.java

+3 −2
Original line number Diff line number Diff line
@@ -6,6 +6,7 @@ import android.content.Context; 
import android.content.Intent;

import android.net.Uri;

import android.os.Handler;

import android.os.UserHandle;

import android.provider.Settings;

import android.text.TextUtils;

import android.view.LayoutInflater;
@@ -50,8 +51,8 @@ public class AlarmTile extends QuickSettingsTile { 


    private synchronized void updateTile() {

        mDrawable = R.drawable.ic_qs_alarm_on;

        mLabel = Settings.System.getString(mContext.getContentResolver(),

                Settings.System.NEXT_ALARM_FORMATTED);

        mLabel = Settings.System.getStringForUser(mContext.getContentResolver(),

                Settings.System.NEXT_ALARM_FORMATTED, UserHandle.USER_CURRENT);

    }



    @Override

packages/SystemUI/src/com/android/systemui/quicksettings/ExpandedDesktopTile.java

+6 −4
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ import android.content.Context; 
import android.content.Intent;

import android.net.Uri;

import android.os.Handler;

import android.os.UserHandle;

import android.provider.Settings;

import android.view.LayoutInflater;

import android.view.View;
@@ -24,8 +25,9 @@ public class ExpandedDesktopTile extends QuickSettingsTile { 
            @Override

            public void onClick(View v) {

                // Change the system setting

                Settings.System.putInt(mContext.getContentResolver(),

                        Settings.System.EXPANDED_DESKTOP_STATE, mEnabled ? 0 : 1);

                Settings.System.putIntForUser(mContext.getContentResolver(),

                        Settings.System.EXPANDED_DESKTOP_STATE, mEnabled ? 0 : 1,

                        UserHandle.USER_CURRENT);

            }

        };
@@ -56,8 +58,8 @@ public class ExpandedDesktopTile extends QuickSettingsTile { 
    }



    private synchronized void updateTile() {

        mEnabled = Settings.System.getInt(mContext.getContentResolver(),

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

        mEnabled = Settings.System.getIntForUser(mContext.getContentResolver(),

                Settings.System.EXPANDED_DESKTOP_STATE, 0, UserHandle.USER_CURRENT) == 1;

        if (mEnabled) {

            mDrawable = R.drawable.ic_qs_expanded_desktop_on;

            mLabel = mContext.getString(R.string.quick_settings_expanded_desktop);

packages/SystemUI/src/com/android/systemui/quicksettings/MobileNetworkTypeTile.java

+3 −2
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ package com.android.systemui.quicksettings; 


import android.content.Context;

import android.content.Intent;

import android.os.UserHandle;

import android.provider.Settings;

import android.provider.Settings.SettingNotFoundException;

import android.util.Log;
@@ -206,9 +207,9 @@ public class MobileNetworkTypeTile extends QuickSettingsTile implements NetworkS 
    }



    private int getCurrentCMMode() {

        return Settings.System.getInt(mContext.getContentResolver(),

        return Settings.System.getIntForUser(mContext.getContentResolver(),

                Settings.System.EXPANDED_NETWORK_MODE,

                CM_MODE_3G2G);

                CM_MODE_3G2G, UserHandle.USER_CURRENT);

    }



    @Override

packages/SystemUI/src/com/android/systemui/quicksettings/QuickSettingsTile.java

+2 −1
Original line number Diff line number Diff line
@@ -102,7 +102,8 @@ public class QuickSettingsTile implements OnClickListener { 
    public final void onClick(View v) {

        mOnClick.onClick(v);

        ContentResolver resolver = mContext.getContentResolver();

        boolean shouldCollapse = Settings.System.getInt(resolver, Settings.System.QS_COLLAPSE_PANEL, 0) == 1;

        boolean shouldCollapse = Settings.System.getIntForUser(resolver,

                Settings.System.QS_COLLAPSE_PANEL, 0, UserHandle.USER_CURRENT) == 1;

        if (shouldCollapse) {

            mQsc.mBar.collapseAllPanels(true);

        }