diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index cece3877b8d..5a4c62c68ed 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -868,10 +868,6 @@
For black/white-listing notifications pinging through HALO
Black list
White list
- HALO color
- HALO button color
- HALO text bubble color
- HALO ping color
HALO pause active app
When opening an app with HALO the underlying app will get paused (enabled by default on low memory devices)
HALO notification visibility
diff --git a/res/xml/user_interface_settings.xml b/res/xml/user_interface_settings.xml
index 704e2d4c9cc..b1f45304e11 100644
--- a/res/xml/user_interface_settings.xml
+++ b/res/xml/user_interface_settings.xml
@@ -106,28 +106,6 @@
android:summary="@string/halo_gone_summary"
android:dependency="halo_enabled" />
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/com/android/settings/UserInterface.java b/src/com/android/settings/UserInterface.java
index 831fdeac519..da36562b9e0 100644
--- a/src/com/android/settings/UserInterface.java
+++ b/src/com/android/settings/UserInterface.java
@@ -63,9 +63,6 @@ public class UserInterface extends SettingsPreferenceFragment implements OnPrefe
private static final String KEY_HALO_REVERSED = "halo_reversed";
private static final String KEY_HALO_PAUSE = "halo_pause";
private static final String KEY_WE_WANT_POPUPS = "show_popup";
- private static final String KEY_HALO_BUTTON_COLOR = "halo_button_color";
- private static final String KEY_HALO_TEXT_BUBBLE_COLOR = "halo_text_bubble_color";
- private static final String KEY_HALO_PING_COLOR = "halo_ping_color";
private static final String KEY_HALO_GONE = "halo_gone";
private Preference mLcdDensity;
@@ -84,9 +81,6 @@ public class UserInterface extends SettingsPreferenceFragment implements OnPrefe
private CheckBoxPreference mHaloReversed;
private CheckBoxPreference mHaloPause;
private CheckBoxPreference mWeWantPopups;
- private Preference mHaloButtonColor;
- private Preference mHaloTextBubbleColor;
- private Preference mHaloPingColor;
private CheckBoxPreference mHaloGone;
private boolean mIsCrtOffChecked = false;
@@ -143,13 +137,6 @@ public void onCreate(Bundle savedInstanceState) {
mWeWantPopups.setOnPreferenceChangeListener(this);
mWeWantPopups.setChecked(showPopups > 0);
- mHaloButtonColor =
- (Preference) prefSet.findPreference(KEY_HALO_BUTTON_COLOR);
- mHaloTextBubbleColor =
- (Preference) prefSet.findPreference(KEY_HALO_TEXT_BUBBLE_COLOR);
- mHaloPingColor =
- (Preference) prefSet.findPreference(KEY_HALO_PING_COLOR);
-
mCustomLabel = findPreference(PREF_CUSTOM_CARRIER_LABEL);
updateCustomLabelTextSummary();
@@ -301,31 +288,10 @@ public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, Preferen
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.HALO_REVERSED, mHaloReversed.isChecked()
? 1 : 0);
- } else if (preference == mHaloPause) {
+ } else if (preference == mHaloPause) {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.HALO_PAUSE, mHaloPause.isChecked()
? 1 : 0);
- } else if (preference == mHaloButtonColor) {
- ColorPickerDialog cp = new ColorPickerDialog(getActivity(),
- mButtonColorListener, Settings.System.getInt(mContext.getContentResolver(),
- Settings.System.HALO_BUTTON_COLOR, 0x00000000));
- cp.setDefaultColor(0x00000000);
- cp.show();
- return true;
- } else if (preference == mHaloTextBubbleColor) {
- ColorPickerDialog cp = new ColorPickerDialog(getActivity(),
- mTextBubbleColorListener, Settings.System.getInt(mContext.getContentResolver(),
- Settings.System.HALO_TEXT_BUBBLE_COLOR, 0x00000000));
- cp.setDefaultColor(0x00000000);
- cp.show();
- return true;
- } else if (preference == mHaloPingColor) {
- ColorPickerDialog cp = new ColorPickerDialog(getActivity(),
- mPingColorListener, Settings.System.getInt(mContext.getContentResolver(),
- Settings.System.HALO_PING_COLOR, 0xff33b5e5));
- cp.setDefaultColor(0xff33b5e5);
- cp.show();
- return true;
} else if (preference == mHaloGone) {
Settings.System.putInt(mContext.getContentResolver(),
Settings.System.HALO_GONE, mHaloGone.isChecked()
@@ -365,35 +331,5 @@ public void onClick(DialogInterface dialog, int whichButton) {
return super.onPreferenceTreeClick(preferenceScreen, preference);
}
- ColorPickerDialog.OnColorChangedListener mButtonColorListener =
- new ColorPickerDialog.OnColorChangedListener() {
- public void colorChanged(int color) {
- Settings.System.putInt(getContentResolver(),
- Settings.System.HALO_BUTTON_COLOR, color);
- }
- public void colorUpdate(int color) {
- }
- };
-
- ColorPickerDialog.OnColorChangedListener mTextBubbleColorListener =
- new ColorPickerDialog.OnColorChangedListener() {
- public void colorChanged(int color) {
- Settings.System.putInt(getContentResolver(),
- Settings.System.HALO_TEXT_BUBBLE_COLOR, color);
- }
- public void colorUpdate(int color) {
- }
- };
-
- ColorPickerDialog.OnColorChangedListener mPingColorListener =
- new ColorPickerDialog.OnColorChangedListener() {
- public void colorChanged(int color) {
- Settings.System.putInt(getContentResolver(),
- Settings.System.HALO_PING_COLOR, color);
- }
- public void colorUpdate(int color) {
- }
- };
-
}