Settings : Cleanup control media volume toggle (7cb203df) · Commits · e / os / android_packages_apps_Settings

res/xml/button_settings.xml

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -244,7 +244,7 @@
	android:summary="@string/volbtn_music_controls_summary"		android:summary="@string/volbtn_music_controls_summary"
	android:defaultValue="true" />		android:defaultValue="true" />

	<com.android.settings.cyanogenmod.SecureSettingSwitchPreference		<com.android.settings.cyanogenmod.CMSystemSettingSwitchPreference
	android:key="volume_keys_control_ring_stream"		android:key="volume_keys_control_ring_stream"
	android:title="@string/volume_keys_control_ring_stream_title"		android:title="@string/volume_keys_control_ring_stream_title"
	android:summaryOn="@string/volume_keys_control_ring_stream_summary_on"		android:summaryOn="@string/volume_keys_control_ring_stream_summary_on"

src/com/android/settings/ButtonSettings.java

+0 −13

Original line number	Original line	Diff line number	Diff line
	@@ -133,7 +133,6 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
	private ListPreference mVolumeKeyCursorControl;		private ListPreference mVolumeKeyCursorControl;
	private SwitchPreference mVolumeWakeScreen;		private SwitchPreference mVolumeWakeScreen;
	private SwitchPreference mVolumeMusicControls;		private SwitchPreference mVolumeMusicControls;
	private SwitchPreference mVolumeControlRingStream;
	private SwitchPreference mSwapVolumeButtons;		private SwitchPreference mSwapVolumeButtons;
	private SwitchPreference mDisableNavigationKeys;		private SwitchPreference mDisableNavigationKeys;
	private SwitchPreference mNavigationBarLeftPref;		private SwitchPreference mNavigationBarLeftPref;
	@@ -442,14 +441,6 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
	mVolumeWakeScreen = (SwitchPreference) findPreference(CMSettings.System.VOLUME_WAKE_SCREEN);		mVolumeWakeScreen = (SwitchPreference) findPreference(CMSettings.System.VOLUME_WAKE_SCREEN);
	mVolumeMusicControls = (SwitchPreference) findPreference(KEY_VOLUME_MUSIC_CONTROLS);		mVolumeMusicControls = (SwitchPreference) findPreference(KEY_VOLUME_MUSIC_CONTROLS);

	mVolumeControlRingStream = (SwitchPreference)
	findPreference(KEY_VOLUME_CONTROL_RING_STREAM);
	int volumeControlRingtone = CMSettings.System.getInt(getContentResolver(),
	CMSettings.System.VOLUME_KEYS_CONTROL_RING_STREAM, 1);
	if (mVolumeControlRingStream != null) {
	mVolumeControlRingStream.setChecked(volumeControlRingtone > 0);
	}

	if (mVolumeWakeScreen != null) {		if (mVolumeWakeScreen != null) {
	if (mVolumeMusicControls != null) {		if (mVolumeMusicControls != null) {
	mVolumeMusicControls.setDependency(CMSettings.System.VOLUME_WAKE_SCREEN);		mVolumeMusicControls.setDependency(CMSettings.System.VOLUME_WAKE_SCREEN);
	@@ -726,10 +717,6 @@ public class ButtonSettings extends SettingsPreferenceFragment implements
	? (ScreenType.isTablet(getActivity()) ? 2 : 1) : 0;		? (ScreenType.isTablet(getActivity()) ? 2 : 1) : 0;
	CMSettings.System.putInt(getActivity().getContentResolver(),		CMSettings.System.putInt(getActivity().getContentResolver(),
	CMSettings.System.SWAP_VOLUME_KEYS_ON_ROTATION, value);		CMSettings.System.SWAP_VOLUME_KEYS_ON_ROTATION, value);
	} else if (preference == mVolumeControlRingStream) {
	int value = mVolumeControlRingStream.isChecked() ? 1 : 0;
	CMSettings.System.putInt(getActivity().getContentResolver(),
	CMSettings.System.VOLUME_KEYS_CONTROL_RING_STREAM, value);
	} else if (preference == mDisableNavigationKeys) {		} else if (preference == mDisableNavigationKeys) {
	mDisableNavigationKeys.setEnabled(false);		mDisableNavigationKeys.setEnabled(false);
	mNavigationPreferencesCat.setEnabled(false);		mNavigationPreferencesCat.setEnabled(false);