Add MultiUser support for additional Settings (b5e47968) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+6 −0

Original line number	Diff line number	Diff line
		@@ -2120,6 +2120,12 @@
		</intent-filter>
		</receiver>

		<receiver android:name=".cyanogenmod.UserChangedReceiver" android:enabled="true">
		<intent-filter >
		<action android:name="com.cyanogenmod.action.UserChanged" />
		</intent-filter>
		</receiver>

		<!-- Watch for ContactsContract.Profile changes and update the user's photo. -->
		<receiver android:name=".users.ProfileUpdateReceiver">
		<intent-filter>

src/com/android/settings/ButtonSettings.java

+8 −8

Original line number	Diff line number	Diff line
		@@ -378,8 +378,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		try {
		// Only show the navigation bar category on devices that have a navigation bar
		// unless we are forcing it via development settings
		boolean forceNavbar = android.provider.Settings.System.getInt(resolver,
		android.provider.Settings.System.DEV_FORCE_SHOW_NAVBAR, 0) == 1;
		boolean forceNavbar = android.provider.Settings.Secure.getInt(resolver,
		android.provider.Settings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) == 1;
		boolean hasNavBar = WindowManagerGlobal.getWindowManagerService().hasNavigationBar()
		\|\| forceNavbar;

		@@ -491,8 +491,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		final int defaultBrightness = context.getResources().getInteger(
		com.android.internal.R.integer.config_buttonBrightnessSettingDefault);

		Settings.System.putInt(context.getContentResolver(),
		Settings.System.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);
		Settings.Secure.putInt(context.getContentResolver(),
		Settings.Secure.DEV_FORCE_SHOW_NAVBAR, enabled ? 1 : 0);
		KeyDisabler.setActive(enabled);

		/* Save/restore button timeouts to disable them in softkey mode */
		@@ -518,8 +518,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		}

		private void updateDisableNavkeysOption() {
		boolean enabled = Settings.System.getInt(getActivity().getContentResolver(),
		Settings.System.DEV_FORCE_SHOW_NAVBAR, 0) != 0;
		boolean enabled = Settings.Secure.getInt(getActivity().getContentResolver(),
		Settings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) != 0;

		mDisableNavigationKeys.setChecked(enabled);
		}
		@@ -571,8 +571,8 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
		return;
		}

		writeDisableNavkeysOption(context, Settings.System.getInt(context.getContentResolver(),
		Settings.System.DEV_FORCE_SHOW_NAVBAR, 0) != 0);
		writeDisableNavkeysOption(context, Settings.Secure.getInt(context.getContentResolver(),
		Settings.Secure.DEV_FORCE_SHOW_NAVBAR, 0) != 0);
		}

src/com/android/settings/SettingsActivity.java

+2 −0

Original line number	Diff line number	Diff line
		@@ -230,6 +230,7 @@ public class SettingsActivity extends Activity
		R.id.display_and_lights_settings,
		R.id.lockscreen_settings,
		R.id.notification_manager,
		R.id.button_settings,
		R.id.storage_settings,
		R.id.application_settings,
		R.id.battery_settings,
		@@ -246,6 +247,7 @@ public class SettingsActivity extends Activity
		R.id.print_settings,
		R.id.nfc_payment_settings,
		R.id.home_settings,
		R.id.status_bar_settings,
		R.id.dashboard,
		R.id.privacy_settings_cyanogenmod
		};

src/com/android/settings/cyanogenmod/ButtonBacklightBrightness.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -65,7 +65,7 @@ public class ButtonBacklightBrightness extends DialogPreference implements

		if (isKeyboardSupported(context)) {
		mKeyboardBrightness = new BrightnessControl(
		Settings.System.KEYBOARD_BRIGHTNESS, false);
		Settings.Secure.KEYBOARD_BRIGHTNESS, false);
		mActiveControl = mKeyboardBrightness;
		}
		if (isButtonSupported(context)) {
		@@ -76,7 +76,7 @@ public class ButtonBacklightBrightness extends DialogPreference implements
		com.android.internal.R.integer.config_buttonBrightnessSettingDefault);

		mButtonBrightness = new BrightnessControl(
		Settings.System.BUTTON_BRIGHTNESS, isSingleValue, defaultBrightness);
		Settings.Secure.BUTTON_BRIGHTNESS, isSingleValue, defaultBrightness);
		mActiveControl = mButtonBrightness;
		}

		@@ -259,12 +259,12 @@ public class ButtonBacklightBrightness extends DialogPreference implements

		private int getTimeout() {
		return Settings.System.getInt(mResolver,
		Settings.System.BUTTON_BACKLIGHT_TIMEOUT, DEFAULT_BUTTON_TIMEOUT * 1000) / 1000;
		Settings.Secure.BUTTON_BACKLIGHT_TIMEOUT, DEFAULT_BUTTON_TIMEOUT * 1000) / 1000;
		}

		private void applyTimeout(int timeout) {
		Settings.System.putInt(mResolver,
		Settings.System.BUTTON_BACKLIGHT_TIMEOUT, timeout * 1000);
		Settings.Secure.BUTTON_BACKLIGHT_TIMEOUT, timeout * 1000);
		}

		private void updateBrightnessPreview() {

src/com/android/settings/cyanogenmod/PowerMenuActions.java

+4 −4

Original line number	Diff line number	Diff line
		@@ -256,8 +256,8 @@ public class PowerMenuActions extends SettingsPreferenceFragment {
		private void getUserConfig() {
		mLocalUserConfig.clear();
		String[] defaultActions;
		String savedActions = Settings.Global.getStringForUser(mContext.getContentResolver(),
		Settings.Global.POWER_MENU_ACTIONS, UserHandle.USER_CURRENT);
		String savedActions = Settings.Secure.getStringForUser(mContext.getContentResolver(),
		Settings.Secure.POWER_MENU_ACTIONS, UserHandle.USER_CURRENT);

		if (savedActions == null) {
		defaultActions = mContext.getResources().getStringArray(
		@@ -292,8 +292,8 @@ public class PowerMenuActions extends SettingsPreferenceFragment {
		}
		}

		Settings.Global.putStringForUser(getContentResolver(),
		Settings.Global.POWER_MENU_ACTIONS, s.toString(), UserHandle.USER_CURRENT);
		Settings.Secure.putStringForUser(getContentResolver(),
		Settings.Secure.POWER_MENU_ACTIONS, s.toString(), UserHandle.USER_CURRENT);
		updatePowerMenuDialog();
		}