aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--doze/res/xml/doze_settings.xml7
-rw-r--r--doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java26
-rw-r--r--doze/src/org/lineageos/settings/doze/Utils.java25
3 files changed, 1 insertions, 57 deletions
diff --git a/doze/res/xml/doze_settings.xml b/doze/res/xml/doze_settings.xml
index e00d61a..fe4fa0a 100644
--- a/doze/res/xml/doze_settings.xml
+++ b/doze/res/xml/doze_settings.xml
@@ -17,13 +17,6 @@
-->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
- <SwitchPreference
- android:key="always_on_display"
- android:disableDependentsState="true"
- android:title="@string/ambient_display_always_on_title"
- android:summary="@string/ambient_display_always_on_summary"
- android:persistent="false" />
-
<PreferenceCategory
android:key="tilt_sensor"
android:title="@string/tilt_sensor_title">
diff --git a/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java b/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
index 32e1049..4701eff 100644
--- a/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
+++ b/doze/src/org/lineageos/settings/doze/DozeSettingsFragment.java
@@ -46,8 +46,6 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
private TextView mTextView;
private View mSwitchBar;
- private SwitchPreference mAlwaysOnDisplayPreference;
-
private SwitchPreference mPickUpPreference;
private SwitchPreference mHandwavePreference;
private SwitchPreference mPocketPreference;
@@ -68,13 +66,6 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
boolean dozeEnabled = Utils.isDozeEnabled(getActivity());
- mAlwaysOnDisplayPreference = (SwitchPreference) findPreference(Utils.ALWAYS_ON_DISPLAY);
- mAlwaysOnDisplayPreference.setEnabled(dozeEnabled);
- mAlwaysOnDisplayPreference.setChecked(Utils.isAlwaysOnEnabled(getActivity()));
- mAlwaysOnDisplayPreference.setOnPreferenceChangeListener(this);
-
- PreferenceCategory tiltSensorCategory =
- (PreferenceCategory) getPreferenceScreen().findPreference(Utils.CATEG_TILT_SENSOR);
PreferenceCategory proximitySensorCategory =
(PreferenceCategory) getPreferenceScreen().findPreference(Utils.CATEG_PROX_SENSOR);
@@ -94,14 +85,6 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
if (!Utils.getProxCheckBeforePulse(getActivity())) {
getPreferenceScreen().removePreference(proximitySensorCategory);
}
-
- // Hide AOD if not supported and set all its dependents otherwise
- if (!Utils.alwaysOnDisplayAvailable(getActivity())) {
- getPreferenceScreen().removePreference(mAlwaysOnDisplayPreference);
- } else {
- tiltSensorCategory.setDependency(Utils.ALWAYS_ON_DISPLAY);
- proximitySensorCategory.setDependency(Utils.ALWAYS_ON_DISPLAY);
- }
}
@Override
@@ -135,9 +118,6 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
@Override
public boolean onPreferenceChange(Preference preference, Object newValue) {
- if (Utils.ALWAYS_ON_DISPLAY.equals(preference.getKey())) {
- Utils.enableAlwaysOn(getActivity(), (Boolean) newValue);
- }
mHandler.post(() -> Utils.checkDozeService(getActivity()));
@@ -152,12 +132,6 @@ public class DozeSettingsFragment extends PreferenceFragment implements OnPrefer
mTextView.setText(getString(isChecked ? R.string.switch_bar_on : R.string.switch_bar_off));
mSwitchBar.setActivated(isChecked);
- if (!isChecked) {
- Utils.enableAlwaysOn(getActivity(), false);
- mAlwaysOnDisplayPreference.setChecked(false);
- }
- mAlwaysOnDisplayPreference.setEnabled(isChecked);
-
mPickUpPreference.setEnabled(isChecked);
mHandwavePreference.setEnabled(isChecked);
mPocketPreference.setEnabled(isChecked);
diff --git a/doze/src/org/lineageos/settings/doze/Utils.java b/doze/src/org/lineageos/settings/doze/Utils.java
index 185dd60..987e06a 100644
--- a/doze/src/org/lineageos/settings/doze/Utils.java
+++ b/doze/src/org/lineageos/settings/doze/Utils.java
@@ -20,13 +20,11 @@ package org.lineageos.settings.doze;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager;
-import android.hardware.display.AmbientDisplayConfiguration;
import android.os.UserHandle;
import android.provider.Settings;
import android.util.Log;
import androidx.preference.PreferenceManager;
-import static android.provider.Settings.Secure.DOZE_ALWAYS_ON;
import static android.provider.Settings.Secure.DOZE_ENABLED;
public final class Utils {
@@ -36,9 +34,6 @@ public final class Utils {
private static final String DOZE_INTENT = "com.android.systemui.doze.pulse";
- protected static final String ALWAYS_ON_DISPLAY = "always_on_display";
-
- protected static final String CATEG_TILT_SENSOR = "tilt_sensor";
protected static final String CATEG_PROX_SENSOR = "proximity_sensor";
protected static final String GESTURE_PICK_UP_KEY = "gesture_pick_up";
@@ -58,7 +53,7 @@ public final class Utils {
}
protected static void checkDozeService(Context context) {
- if (isDozeEnabled(context) && !isAlwaysOnEnabled(context) && sensorsEnabled(context)) {
+ if (isDozeEnabled(context) && sensorsEnabled(context)) {
startService(context);
} else {
stopService(context);
@@ -92,24 +87,6 @@ public final class Utils {
new UserHandle(UserHandle.USER_CURRENT));
}
- protected static boolean enableAlwaysOn(Context context, boolean enable) {
- return Settings.Secure.putIntForUser(context.getContentResolver(),
- DOZE_ALWAYS_ON, enable ? 1 : 0, UserHandle.USER_CURRENT);
- }
-
- protected static boolean isAlwaysOnEnabled(Context context) {
- final boolean enabledByDefault = context.getResources()
- .getBoolean(com.android.internal.R.bool.config_dozeAlwaysOnEnabled);
-
- return Settings.Secure.getIntForUser(context.getContentResolver(),
- DOZE_ALWAYS_ON, alwaysOnDisplayAvailable(context) && enabledByDefault ? 1 : 0,
- UserHandle.USER_CURRENT) != 0;
- }
-
- protected static boolean alwaysOnDisplayAvailable(Context context) {
- return new AmbientDisplayConfiguration(context).alwaysOnAvailable();
- }
-
protected static boolean isGestureEnabled(Context context, String gesture) {
return PreferenceManager.getDefaultSharedPreferences(context)
.getBoolean(gesture, false);
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-19 13:13:33 +0000