From 5d540391f0f1aab6eb664007f22a6389ab9469e5 Mon Sep 17 00:00:00 2001
From: Paul Kocialkowski <contact@paulk.fr>
Date: Tue, 10 Jul 2012 16:48:01 +0200
Subject: AriesParts: disabled TvOut (relies on a non-free library)

Signed-off-by: Paul Kocialkowski <contact@paulk.fr>
---
 .../src/com/cyanogenmod/AriesParts/AriesParts.java | 52 ----------------------
 1 file changed, 52 deletions(-)

(limited to 'AriesParts/src/com/cyanogenmod/AriesParts/AriesParts.java')

diff --git a/AriesParts/src/com/cyanogenmod/AriesParts/AriesParts.java b/AriesParts/src/com/cyanogenmod/AriesParts/AriesParts.java
index 3d6a68f..4dfb944 100644
--- a/AriesParts/src/com/cyanogenmod/AriesParts/AriesParts.java
+++ b/AriesParts/src/com/cyanogenmod/AriesParts/AriesParts.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;
@@ -16,22 +15,16 @@ public class AriesParts extends PreferenceActivity  {
     public static final String KEY_COLOR_TUNING = "color_tuning";
     public static final String KEY_BACKLIGHT_TIMEOUT = "backlight_timeout";
     public static final String KEY_HSPA = "hspa";
-    public static final String KEY_TVOUT_ENABLE = "tvout_enable";
-    public static final String KEY_TVOUT_SYSTEM = "tvout_system";
 
     private ColorTuningPreference mColorTuning;
     private ListPreference mBacklightTimeout;
     private ListPreference mHspa;
-    private CheckBoxPreference mTvOutEnable;
-    private ListPreference mTvOutSystem;
-    private TvOut mTvOut;
 
     private BroadcastReceiver mHeadsetReceiver = new BroadcastReceiver() {
 
         @Override
         public void onReceive(Context context, Intent intent) {
             int state = intent.getIntExtra("state", 0);
-            updateTvOutEnable(state != 0);
         }
 
     };
@@ -51,40 +44,6 @@ public class AriesParts extends PreferenceActivity  {
         mHspa = (ListPreference) findPreference(KEY_HSPA);
         mHspa.setEnabled(Hspa.isSupported());
         mHspa.setOnPreferenceChangeListener(new Hspa(this));
-
-        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(AriesParts.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(AriesParts.this, TvOutService.class);
-                    i.putExtra(TvOutService.EXTRA_COMMAND, TvOutService.COMMAND_CHANGE_SYSTEM);
-                    i.putExtra(TvOutService.EXTRA_SYSTEM, newSystem);
-                    startService(i);
-                }
-                return true;
-            }
-
-        });
     }
 
     @Override
@@ -99,19 +58,8 @@ public class AriesParts extends PreferenceActivity  {
         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();
     }
 
-- 
cgit v1.1