summaryrefslogtreecommitdiffstats
path: root/DeviceSettings/src
diff options
context:
space:
mode:
Diffstat (limited to 'DeviceSettings/src')
-rw-r--r--DeviceSettings/src/com/cyanogenmod/settings/device/RadioFragmentActivity.java8
-rw-r--r--DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java8
2 files changed, 15 insertions, 1 deletions
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/RadioFragmentActivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/RadioFragmentActivity.java
index d094ef2..e4b1eda 100644
--- a/DeviceSettings/src/com/cyanogenmod/settings/device/RadioFragmentActivity.java
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/RadioFragmentActivity.java
@@ -17,6 +17,7 @@
package com.cyanogenmod.settings.device;
import android.content.Context;
+import android.content.res.Resources;
import android.content.SharedPreferences;
import android.os.Bundle;
import android.preference.CheckBoxPreference;
@@ -35,6 +36,9 @@ public class RadioFragmentActivity extends PreferenceFragment {
private static final String PREF_ENABLED = "1";
private static final String TAG = "DeviceSettings_Radio";
+ private static boolean sHspa;
+ private Hspa mHspa;
+
@Override
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -42,7 +46,11 @@ public class RadioFragmentActivity extends PreferenceFragment {
addPreferencesFromResource(R.xml.radio_preferences);
PreferenceScreen prefSet = getPreferenceScreen();
+ Resources res = getResources();
+ sHspa = res.getBoolean(R.bool.has_hspa);
+ mHspa = (Hspa) findPreference(DeviceSettings.KEY_HSPA);
+ mHspa.setEnabled(sHspa);
}
@Override
diff --git a/DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java b/DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java
index 9efe06d..f5c33b5 100644
--- a/DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java
+++ b/DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java
@@ -41,8 +41,10 @@ public class ScreenFragmentActivity extends PreferenceFragment {
private mDNIeMode mmDNIeMode;
private mDNIeNegative mmDNIeNegative;
private LedFade mLedFade;
+ private CheckBoxPreference mTouchKey;
private static boolean sSPenSupported;
+ private static boolean sTouchkeySupport;
private static final String FILE_TOUCHKEY_BRIGHTNESS = "/sys/class/sec/sec_touchkey/brightness";
private static final String FILE_TOUCHKEY_DISABLE = "/sys/class/sec/sec_touchkey/force_disable";
@@ -74,7 +76,11 @@ public class ScreenFragmentActivity extends PreferenceFragment {
mLedFade.setEnabled(LedFade.isSupported());
/* Touchkey */
- if (((CheckBoxPreference)preferenceScreen.findPreference(DeviceSettings.KEY_TOUCHKEY_LIGHT)).isChecked()) {
+ sTouchkeySupport = res.getBoolean(R.bool.has_touchkey);
+ mTouchKey = (CheckBoxPreference)preferenceScreen.findPreference(DeviceSettings.KEY_TOUCHKEY_LIGHT);
+ mTouchKey.setEnabled(sTouchkeySupport);
+
+ if (mTouchKey.isChecked() && mTouchKey.isEnabled()) {
preferenceScreen.findPreference(DeviceSettings.KEY_TOUCHKEY_TIMEOUT).setEnabled(true);
} else {
preferenceScreen.findPreference(DeviceSettings.KEY_TOUCHKEY_TIMEOUT).setEnabled(false);