diff options
| author | Daniel Hillenbrand <codeworkx@cyanogenmod.org> | 2013-06-26 12:53:45 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2013-06-26 12:53:45 -0700 |
| commit | 6e9cac3c1b8cf3e2bf16807b12db0273b76d3e7a (patch) | |
| tree | 22514f9665866853b554bcfb6465f60f5e621527 /DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java | |
| parent | e68369a811d77da1497a7326ab9df03fe45d1af0 (diff) | |
| parent | 5d158f44a728e13b4e0bdd0eb76b53e9e2afd451 (diff) | |
| download | device_samsung_smdk4412-common-6e9cac3c1b8cf3e2bf16807b12db0273b76d3e7a.zip device_samsung_smdk4412-common-6e9cac3c1b8cf3e2bf16807b12db0273b76d3e7a.tar.gz device_samsung_smdk4412-common-6e9cac3c1b8cf3e2bf16807b12db0273b76d3e7a.tar.bz2 | |
Merge "DeviceSettings: add more overlays" into cm-10.1
Diffstat (limited to 'DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java')
| -rw-r--r-- | DeviceSettings/src/com/cyanogenmod/settings/device/ScreenFragmentActivity.java | 8 |
1 files changed, 7 insertions, 1 deletions
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); |