diff options
Diffstat (limited to 'AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java')
-rw-r--r-- | AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java | 63 |
1 files changed, 0 insertions, 63 deletions
diff --git a/AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java b/AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java index 1eb677b..e254f2f 100644 --- a/AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java +++ b/AriesParts/src/com/cyanogenmod/settings/device/DeviceSettings.java @@ -4,7 +4,6 @@ import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; -import android.hardware.TvOut; import android.os.Bundle; import android.preference.CheckBoxPreference; import android.preference.ListPreference; @@ -19,8 +18,6 @@ public class DeviceSettings extends PreferenceActivity { public static final String KEY_BACKLIGHT_TIMEOUT = "backlight_timeout"; public static final String KEY_HSPA = "hspa"; public static final String KEY_HSPA_CATEGORY = "category_radio"; - public static final String KEY_TVOUT_ENABLE = "tvout_enable"; - public static final String KEY_TVOUT_SYSTEM = "tvout_system"; public static final String KEY_VOLUME_BOOST = "volume_boost"; public static final String KEY_VOLUME_CATEGORY = "category_volume_boost"; @@ -28,21 +25,8 @@ public class DeviceSettings extends PreferenceActivity { private ListPreference mMdnie; private ListPreference mBacklightTimeout; private ListPreference mHspa; - private CheckBoxPreference mTvOutEnable; - private ListPreference mTvOutSystem; - private TvOut mTvOut; private VolumeBoostPreference mVolumeBoost; - private BroadcastReceiver mHeadsetReceiver = new BroadcastReceiver() { - - @Override - public void onReceive(Context context, Intent intent) { - int state = intent.getIntExtra("state", 0); - updateTvOutEnable(state != 0); - } - - }; - @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); @@ -74,67 +58,20 @@ public class DeviceSettings extends PreferenceActivity { category.removePreference(mVolumeBoost); getPreferenceScreen().removePreference(category); } - - mTvOut = new TvOut(); - mTvOutEnable = (CheckBoxPreference) findPreference(KEY_TVOUT_ENABLE); - mTvOutEnable.setChecked(mTvOut._isEnabled()); - - mTvOutEnable.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - boolean enable = (Boolean) newValue; - Intent i = new Intent(DeviceSettings.this, TvOutService.class); - i.putExtra(TvOutService.EXTRA_COMMAND, enable ? TvOutService.COMMAND_ENABLE : TvOutService.COMMAND_DISABLE); - startService(i); - return true; - } - - }); - - mTvOutSystem = (ListPreference) findPreference(KEY_TVOUT_SYSTEM); - mTvOutSystem.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - if (mTvOut._isEnabled()) { - int newSystem = Integer.valueOf((String) newValue); - Intent i = new Intent(DeviceSettings.this, TvOutService.class); - i.putExtra(TvOutService.EXTRA_COMMAND, TvOutService.COMMAND_CHANGE_SYSTEM); - i.putExtra(TvOutService.EXTRA_SYSTEM, newSystem); - startService(i); - } - return true; - } - - }); } @Override protected void onResume() { super.onResume(); - registerReceiver(mHeadsetReceiver, new IntentFilter(Intent.ACTION_HEADSET_PLUG)); } @Override protected void onPause() { super.onPause(); - unregisterReceiver(mHeadsetReceiver); - } - - private void updateTvOutEnable(boolean connected) { - mTvOutEnable.setEnabled(connected); - mTvOutEnable.setSummaryOff(connected ? R.string.tvout_enable_summary : R.string.tvout_enable_summary_nocable); - - if (!connected && mTvOutEnable.isChecked()) { - // Disable on unplug (UI) - mTvOutEnable.setChecked(false); - } } @Override protected void onDestroy() { - mTvOut.finalize(); super.onDestroy(); } |