aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormartinusbe <martinusbe@gmail.com>2018-01-08 17:03:05 +0100
committermartinusbe <martinusbe@gmail.com>2018-01-08 17:08:17 +0100
commit237e5b15a91185997c01ffcc01bd2fc6bc1e9c34 (patch)
tree7108ff5093ff62c2e8a4f5c38a8ebcaea753af56
parentf706c36c279d38537ab10e44482bd0545099fd0e (diff)
slider: remove hwkey swap toggle from slidersettings
* was out of place here and 5t has no use for it will probably add in framework Change-Id: I0bc402210e7f4d5c1f02bdc4c166667ee543e487 Signed-off-by: martinusbe <martinusbe@gmail.com>
-rw-r--r--DeviceHandler/res/xml/slider_panel.xml5
-rw-r--r--DeviceHandler/src/com/slim/device/BootReceiver.java2
-rw-r--r--DeviceHandler/src/com/slim/device/KernelControl.java4
-rw-r--r--DeviceHandler/src/com/slim/device/settings/SliderSettings.java8
4 files changed, 1 insertions, 18 deletions
diff --git a/DeviceHandler/res/xml/slider_panel.xml b/DeviceHandler/res/xml/slider_panel.xml
index ed5d054..80302ba 100644
--- a/DeviceHandler/res/xml/slider_panel.xml
+++ b/DeviceHandler/res/xml/slider_panel.xml
@@ -16,11 +16,6 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <SwitchPreference
- android:key="button_swap"
- android:title="@string/button_swap_title"
- android:summary="@string/button_swap_summary" />
-
<PreferenceCategory
android:title="@string/notification_slider">
diff --git a/DeviceHandler/src/com/slim/device/BootReceiver.java b/DeviceHandler/src/com/slim/device/BootReceiver.java
index ed93ed4..8035938 100644
--- a/DeviceHandler/src/com/slim/device/BootReceiver.java
+++ b/DeviceHandler/src/com/slim/device/BootReceiver.java
@@ -53,12 +53,10 @@ public class BootReceiver extends BroadcastReceiver {
String sliderTop = getPreferenceString(context, "keycode_top_position", "601");
String sliderMiddle = getPreferenceString(context, "keycode_middle_position", "602");
String sliderBottom = getPreferenceString(context, "keycode_bottom_position", "603");
- boolean sliderSwap = getPreferenceBoolean(context, "button_swap", false);
FileUtils.writeLine(KernelControl.KEYCODE_SLIDER_TOP, sliderTop);
FileUtils.writeLine(KernelControl.KEYCODE_SLIDER_MIDDLE, sliderMiddle);
FileUtils.writeLine(KernelControl.KEYCODE_SLIDER_BOTTOM, sliderBottom);
- FileUtils.writeLine(KernelControl.SLIDER_SWAP_NODE, sliderSwap ? "1" : "0");
}
}
diff --git a/DeviceHandler/src/com/slim/device/KernelControl.java b/DeviceHandler/src/com/slim/device/KernelControl.java
index 4705820..376bbca 100644
--- a/DeviceHandler/src/com/slim/device/KernelControl.java
+++ b/DeviceHandler/src/com/slim/device/KernelControl.java
@@ -40,7 +40,6 @@ public final class KernelControl {
private static String GESTURE_SILENT_VIB_SOUND = GESTURE_PATH + "down_arrow_enable";
// Notification slider
- public static final String SLIDER_SWAP_NODE = "/proc/s1302/key_rep";
public static final String KEYCODE_SLIDER_TOP = "/proc/tri-state-key/keyCode_top";
public static final String KEYCODE_SLIDER_MIDDLE = "/proc/tri-state-key/keyCode_middle";
public static final String KEYCODE_SLIDER_BOTTOM = "/proc/tri-state-key/keyCode_bottom";
@@ -81,8 +80,7 @@ public final class KernelControl {
public static boolean hasSlider() {
return new File(KEYCODE_SLIDER_TOP).exists() &&
new File(KEYCODE_SLIDER_MIDDLE).exists() &&
- new File(KEYCODE_SLIDER_BOTTOM).exists() &&
- new File(SLIDER_SWAP_NODE).exists();
+ new File(KEYCODE_SLIDER_BOTTOM).exists();
}
}
diff --git a/DeviceHandler/src/com/slim/device/settings/SliderSettings.java b/DeviceHandler/src/com/slim/device/settings/SliderSettings.java
index c9c13ca..dfe3de0 100644
--- a/DeviceHandler/src/com/slim/device/settings/SliderSettings.java
+++ b/DeviceHandler/src/com/slim/device/settings/SliderSettings.java
@@ -30,7 +30,6 @@ import com.slim.device.util.FileUtils;
public class SliderSettings extends PreferenceActivity
implements OnPreferenceChangeListener {
- private SwitchPreference mSliderSwap;
private ListPreference mSliderTop;
private ListPreference mSliderMiddle;
private ListPreference mSliderBottom;
@@ -40,9 +39,6 @@ public class SliderSettings extends PreferenceActivity
super.onCreate(savedInstanceState);
addPreferencesFromResource(R.xml.slider_panel);
- mSliderSwap = (SwitchPreference) findPreference("button_swap");
- mSliderSwap.setOnPreferenceChangeListener(this);
-
mSliderTop = (ListPreference) findPreference("keycode_top_position");
mSliderTop.setOnPreferenceChangeListener(this);
@@ -70,10 +66,6 @@ public class SliderSettings extends PreferenceActivity
file = KernelControl.KEYCODE_SLIDER_MIDDLE;
} else if (preference == mSliderBottom) {
file = KernelControl.KEYCODE_SLIDER_BOTTOM;
- } else if (preference == mSliderSwap) {
- Boolean value = (Boolean) newValue;
- FileUtils.writeLine(KernelControl.SLIDER_SWAP_NODE, value ? "1" : "0");
- return true;
} else {
return false;
}