summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doze/res/xml/doze_settings.xml70
-rw-r--r--doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java25
-rw-r--r--doze/src/org/lineageos/settings/doze/Utils.java1
3 files changed, 0 insertions, 96 deletions
diff --git a/doze/res/xml/doze_settings.xml b/doze/res/xml/doze_settings.xml
index f7a0c1a..9917b1a 100644
--- a/doze/res/xml/doze_settings.xml
+++ b/doze/res/xml/doze_settings.xml
@@ -62,74 +62,4 @@
android:summary="@string/pocket_gesture_summary" />
</PreferenceCategory>
-
- <PreferenceCategory
- android:key="ambient_light"
- android:title="@string/pulse_ambient_light_enable_title">
-
- <com.aicp.gear.preference.SecureSettingSwitchPreference
- android:key="pulse_ambient_light"
- android:defaultValue="false"
- android:title="@string/pulse_ambient_light_title"
- android:summary="@string/pulse_ambient_light_summary" />
-
- <com.aicp.gear.preference.SecureSettingSwitchPreference
- android:key="pulse_ambient_light_color_automatic"
- android:defaultValue="false"
- android:title="@string/pulse_ambient_light_color_automatic_title"
- android:summary="@string/pulse_ambient_light_color_automatic_summary"
- android:dependency="pulse_ambient_light" />
-
- <com.aicp.gear.preference.SecureSettingIntListPreference
- android:key="pulse_ambient_light_color_mode"
- android:title="@string/pulse_ambient_light_color_mode_title"
- android:entries="@array/pulse_ambient_light_color_mode_entries"
- android:entryValues="@array/pulse_ambient_light_color_mode_values"
- android:defaultValue="1"
- android:dependency="pulse_ambient_light" />
-
- <com.aicp.gear.preference.SecureSettingColorPickerPreference
- android:key="pulse_ambient_light_color"
- android:title="@string/pulse_ambient_light_color_title"
- android:defaultValue="0xFF3980FF"
- android:dependency="pulse_ambient_light" />
-
- <com.aicp.gear.preference.SecureSettingSeekBarPreference
- android:key="pulse_ambient_light_duration"
- android:title="@string/pulse_ambient_light_duration_title"
- android:max="10"
- android:min="1"
- aicpextras:unitsLeft=""
- aicpextras:unitsRight="sec"
- android:defaultValue="3"
- android:dependency="pulse_ambient_light" />
-
- <com.aicp.gear.preference.SecureSettingSeekBarPreference
- android:key="pulse_ambient_light_repeat_count"
- android:title="@string/pulse_ambient_light_repeat_count_title"
- android:max="10"
- android:min="0"
- aicpextras:unitsLeft=""
- aicpextras:unitsRight="times"
- android:defaultValue="0"
- android:dependency="pulse_ambient_light" />
-
- <com.aicp.gear.preference.SecureSettingSwitchPreference
- android:key="pulse_ambient_light_repeat_direction"
- android:defaultValue="false"
- android:title="@string/pulse_ambient_light_repeat_direction_title"
- android:summary="@string/pulse_ambient_light_repeat_direction_summary"
- android:dependency="pulse_ambient_light" />
-
- <com.aicp.gear.preference.SecureSettingSeekBarPreference
- android:key="pulse_ambient_light_width"
- android:title="@string/pulse_ambient_light_width_title"
- android:max="150"
- android:min="1"
- aicpextras:unitsLeft=""
- aicpextras:unitsRight="px"
- android:defaultValue="125"
- android:dependency="pulse_ambient_light" />
- </PreferenceCategory>
-
</PreferenceScreen>
diff --git a/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java b/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
index b9b8ae8..e61d2c9 100644
--- a/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
+++ b/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
@@ -43,23 +43,15 @@ import androidx.preference.PreferenceCategory;
import androidx.preference.PreferenceFragment;
import androidx.preference.SwitchPreference;
-import net.margaritov.preference.colorpicker.ColorPickerPreference;
-
public class DozeSettingsFragment extends PreferenceFragment implements OnPreferenceChangeListener,
CompoundButton.OnCheckedChangeListener {
private static final int CONFIGID_POCKET = com.android.internal.R.bool.config_dozePulseProximity;
private static final int CONFIGID_TILT = com.android.internal.R.bool.config_dozePulseTilt;
- private static final String PULSE_AMBIENT_LIGHT_COLOR_MODE = "pulse_ambient_light_color_mode";
- private static final String PULSE_AMBIENT_LIGHT_COLOR = "pulse_ambient_light_color";
-
private TextView mTextView;
private View mSwitchBar;
- private ColorPickerPreference mEdgeLightColorPref;
- private ListPreference mEdgeLightColorModePref;
-
private SwitchPreference mAlwaysOnDisplayPreference;
private ListPreference mPickUpPreference;
private SwitchPreference mPocketPreference;
@@ -115,14 +107,6 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
pickupSensorCategory.setDependency(Utils.ALWAYS_ON_DISPLAY);
proximitySensorCategory.setDependency(Utils.ALWAYS_ON_DISPLAY);
}
-
- mEdgeLightColorModePref = (ListPreference) findPreference(PULSE_AMBIENT_LIGHT_COLOR_MODE);
- mEdgeLightColorModePref.setOnPreferenceChangeListener(this);
- mEdgeLightColorPref = (ColorPickerPreference) findPreference(PULSE_AMBIENT_LIGHT_COLOR);
- mEdgeLightColorPref.setOnPreferenceChangeListener(this);
- int edgeLightColorMode = Settings.Secure.getIntForUser(getActivity().getContentResolver(),
- Settings.Secure.PULSE_AMBIENT_LIGHT_COLOR_MODE, 1, UserHandle.USER_CURRENT);
- updateColorPrefs(edgeLightColorMode);
}
@Override
@@ -159,11 +143,6 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
if (Utils.ALWAYS_ON_DISPLAY.equals(preference.getKey())) {
Utils.enableAlwaysOn(getActivity(), (Boolean) newValue);
}
- if (mEdgeLightColorModePref.equals(preference)) {
- int edgeLightColorMode = Integer.valueOf((String) newValue);
- updateColorPrefs(edgeLightColorMode);
- return true;
- }
mHandler.post(() -> Utils.checkDozeService(getActivity()));
return true;
@@ -196,10 +175,6 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
return false;
}
- private void updateColorPrefs(int mode) {
- mEdgeLightColorPref.setEnabled(mode == 2);
- }
-
public static class HelpDialogFragment extends DialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
diff --git a/doze/src/org/lineageos/settings/doze/Utils.java b/doze/src/org/lineageos/settings/doze/Utils.java
index 565bd7a..786c824 100644
--- a/doze/src/org/lineageos/settings/doze/Utils.java
+++ b/doze/src/org/lineageos/settings/doze/Utils.java
@@ -41,7 +41,6 @@ public final class Utils {
protected static final String CATEG_PICKUP_SENSOR = "pickup_sensor";
protected static final String CATEG_PROX_SENSOR = "proximity_sensor";
- protected static final String CATEG_AMBIENT_LIGHT = "pulse_ambient_light";
protected static final String GESTURE_PICK_UP_KEY = "gesture_pick_up_type";
protected static final String GESTURE_POCKET_KEY = "gesture_pocket";