diff options
Diffstat (limited to 'src/com/android/settings/cyanogenmod/PieControl.java')
| -rw-r--r-- | src/com/android/settings/cyanogenmod/PieControl.java | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/src/com/android/settings/cyanogenmod/PieControl.java b/src/com/android/settings/cyanogenmod/PieControl.java index b902fc7..da2ee13 100644 --- a/src/com/android/settings/cyanogenmod/PieControl.java +++ b/src/com/android/settings/cyanogenmod/PieControl.java @@ -19,7 +19,6 @@ public class PieControl extends SettingsPreferenceFragment private static final int DEFAULT_POSITION = 1 << 1; // this equals Position.BOTTOM.FLAG private static final String PIE_CONTROL = "pie_control_checkbox"; - private static final String SEARCH_BUTTON = "pie_control_search"; private static final String PIE_SIZE = "pie_control_size"; private static final String[] TRIGGER = { "pie_control_trigger_left", @@ -29,7 +28,6 @@ public class PieControl extends SettingsPreferenceFragment }; private CheckBoxPreference mPieControl; - private CheckBoxPreference mSearchButton; private SeekBarDialogPreference mPieSize; private CheckBoxPreference[] mTrigger = new CheckBoxPreference[4]; @@ -49,8 +47,6 @@ public class PieControl extends SettingsPreferenceFragment PreferenceScreen prefSet = getPreferenceScreen(); mPieControl = (CheckBoxPreference) prefSet.findPreference(PIE_CONTROL); mPieControl.setOnPreferenceChangeListener(this); - mSearchButton = (CheckBoxPreference) prefSet.findPreference(SEARCH_BUTTON); - mSearchButton.setOnPreferenceChangeListener(this); mPieSize = (SeekBarDialogPreference) prefSet.findPreference(PIE_SIZE); for (int i = 0; i < TRIGGER.length; i++) { @@ -68,10 +64,6 @@ public class PieControl extends SettingsPreferenceFragment Settings.System.PIE_CONTROLS, newState ? 1 : 0); propagatePieControl(newState); - } else if (preference == mSearchButton) { - Settings.System.putInt(getContentResolver(), - Settings.System.PIE_SEARCH, (Boolean) newValue ? 1 : 0); - } else { int triggerSlots = 0; for (int i = 0; i < mTrigger.length; i++) { @@ -82,7 +74,7 @@ public class PieControl extends SettingsPreferenceFragment } } Settings.System.putInt(getContentResolver(), - Settings.System.PIE_GRAVITY, triggerSlots); + Settings.System.PIE_POSITIONS, triggerSlots); } return true; } @@ -95,11 +87,8 @@ public class PieControl extends SettingsPreferenceFragment Settings.System.PIE_CONTROLS, 0) == 1); propagatePieControl(mPieControl.isChecked()); - mSearchButton.setChecked(Settings.System.getInt(getContentResolver(), - Settings.System.PIE_SEARCH, 0) == 1); - getContentResolver().registerContentObserver( - Settings.System.getUriFor(Settings.System.PIE_GRAVITY), true, + Settings.System.getUriFor(Settings.System.PIE_POSITIONS), true, mPieTriggerObserver); updatePieTriggers(); @@ -112,7 +101,6 @@ public class PieControl extends SettingsPreferenceFragment } private void propagatePieControl(boolean value) { - mSearchButton.setEnabled(value); for (int i = 0; i < mTrigger.length; i++) { mTrigger[i].setEnabled(value); } @@ -121,7 +109,7 @@ public class PieControl extends SettingsPreferenceFragment private void updatePieTriggers() { int triggerSlots = Settings.System.getInt(getContentResolver(), - Settings.System.PIE_GRAVITY, DEFAULT_POSITION); + Settings.System.PIE_POSITIONS, DEFAULT_POSITION); for (int i = 0; i < mTrigger.length; i++) { if ((triggerSlots & (0x01 << i)) != 0) { |