diff options
| author | Michael Bestas <mikeioannina@gmail.com> | 2014-12-21 00:12:40 +0200 |
|---|---|---|
| committer | Adnan Begovic <adnan@cyngn.com> | 2015-10-29 17:36:27 -0700 |
| commit | b265e3c5fe3de0aa230ff5ecba02bbb62da3c724 (patch) | |
| tree | d8a8ac90cdbcb751f855e96199c48bef1d2d2b7d /src/com/android/settings/ButtonSettings.java | |
| parent | 6d0624b2b28ef9ed879e9a61c8946c25f1284094 (diff) | |
| download | packages_apps_Settings-b265e3c5fe3de0aa230ff5ecba02bbb62da3c724.zip packages_apps_Settings-b265e3c5fe3de0aa230ff5ecba02bbb62da3c724.tar.gz packages_apps_Settings-b265e3c5fe3de0aa230ff5ecba02bbb62da3c724.tar.bz2 | |
Forward port 'Swap volume buttons' (3/3)
Change-Id: I44a2b37b95848fff24c53c4c3561a3c000c487a1
Diffstat (limited to 'src/com/android/settings/ButtonSettings.java')
| -rw-r--r-- | src/com/android/settings/ButtonSettings.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/com/android/settings/ButtonSettings.java b/src/com/android/settings/ButtonSettings.java index 794bd11..c545b9b 100644 --- a/src/com/android/settings/ButtonSettings.java +++ b/src/com/android/settings/ButtonSettings.java @@ -58,6 +58,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements private static final String KEY_APP_SWITCH_PRESS = "hardware_keys_app_switch_press"; private static final String KEY_APP_SWITCH_LONG_PRESS = "hardware_keys_app_switch_long_press"; private static final String KEY_VOLUME_KEY_CURSOR_CONTROL = "volume_key_cursor_control"; + private static final String KEY_SWAP_VOLUME_BUTTONS = "swap_volume_buttons"; private static final String DISABLE_NAV_KEYS = "disable_nav_keys"; private static final String KEY_NAVIGATION_BAR_LEFT = "navigation_bar_left"; private static final String KEY_POWER_END_CALL = "power_end_call"; @@ -104,6 +105,7 @@ public class ButtonSettings extends SettingsPreferenceFragment implements private ListPreference mAppSwitchPressAction; private ListPreference mAppSwitchLongPressAction; private ListPreference mVolumeKeyCursorControl; + private SwitchPreference mSwapVolumeButtons; private SwitchPreference mDisableNavigationKeys; private SwitchPreference mNavigationBarLeftPref; private SwitchPreference mPowerEndCall; @@ -290,6 +292,12 @@ public class ButtonSettings extends SettingsPreferenceFragment implements Settings.System.VOLUME_KEY_CURSOR_CONTROL, 0); mVolumeKeyCursorControl = initActionList(KEY_VOLUME_KEY_CURSOR_CONTROL, cursorControlAction); + + int swapVolumeKeys = Settings.System.getInt(getContentResolver(), + Settings.System.SWAP_VOLUME_KEYS_ON_ROTATION, 0); + mSwapVolumeButtons = (SwitchPreference) + prefScreen.findPreference(KEY_SWAP_VOLUME_BUTTONS); + mSwapVolumeButtons.setChecked(swapVolumeKeys > 0); } else { prefScreen.removePreference(volumeCategory); } @@ -489,7 +497,12 @@ public class ButtonSettings extends SettingsPreferenceFragment implements @Override public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preference preference) { - if (preference == mDisableNavigationKeys) { + if (preference == mSwapVolumeButtons) { + int value = mSwapVolumeButtons.isChecked() + ? (Utils.isTablet(getActivity()) ? 2 : 1) : 0; + Settings.System.putInt(getActivity().getContentResolver(), + Settings.System.SWAP_VOLUME_KEYS_ON_ROTATION, value); + } else if (preference == mDisableNavigationKeys) { mDisableNavigationKeys.setEnabled(false); writeDisableNavkeysOption(getActivity(), mDisableNavigationKeys.isChecked()); updateDisableNavkeysOption(); |