From 8449b50d2233148dda7672870b7c54ba5b1e824b Mon Sep 17 00:00:00 2001 From: Bruno Martins Date: Sat, 26 Dec 2020 17:02:30 +0000 Subject: [PATCH] samsung: doze: Kill proximity wake feature This will be reworked later on. Change-Id: I47e2b0a0c7814ac6a0f33e0016d1c52c7afe222b --- doze/res/xml/gesture_panel.xml | 11 ------- .../settings/doze/SamsungDozeService.java | 11 +------ .../doze/TouchscreenGestureSettings.java | 32 +------------------ 3 files changed, 2 insertions(+), 52 deletions(-) diff --git a/doze/res/xml/gesture_panel.xml b/doze/res/xml/gesture_panel.xml index 1a063d16..adbab9f4 100644 --- a/doze/res/xml/gesture_panel.xml +++ b/doze/res/xml/gesture_panel.xml @@ -41,15 +41,4 @@ android:dependency="doze_enabled" /> - - - - - diff --git a/doze/src/org/lineageos/settings/doze/SamsungDozeService.java b/doze/src/org/lineageos/settings/doze/SamsungDozeService.java index 063b121d..47bc96a4 100644 --- a/doze/src/org/lineageos/settings/doze/SamsungDozeService.java +++ b/doze/src/org/lineageos/settings/doze/SamsungDozeService.java @@ -46,7 +46,6 @@ public class SamsungDozeService extends Service { private static final String GESTURE_HAND_WAVE_KEY = "gesture_hand_wave"; private static final String GESTURE_POCKET_KEY = "gesture_pocket"; - private static final String PROXIMITY_WAKE_KEY = "proximity_wake_enable"; private static final int POCKET_DELTA_NS = 1000 * 1000 * 1000; @@ -56,7 +55,6 @@ public class SamsungDozeService extends Service { private boolean mHandwaveGestureEnabled = false; private boolean mPocketGestureEnabled = false; - private boolean mProximityWakeEnabled = false; class SamsungProximitySensor implements SensorEventListener { private SensorManager mSensorManager; @@ -93,9 +91,6 @@ public class SamsungDozeService extends Service { if (mHandwaveGestureEnabled && mPocketGestureEnabled) { return true; - } else if (mProximityWakeEnabled && (delta < POCKET_DELTA_NS)) { - mPowerManager.wakeUp(TimeUnit.NANOSECONDS.toMillis(System.nanoTime())); - return false; } else if (mHandwaveGestureEnabled && !mPocketGestureEnabled) { return delta < POCKET_DELTA_NS; } else if (!mHandwaveGestureEnabled && mPocketGestureEnabled) { @@ -105,8 +100,7 @@ public class SamsungDozeService extends Service { } public void testAndEnable() { - if ((isDozeEnabled() && (mHandwaveGestureEnabled || mPocketGestureEnabled)) || - mProximityWakeEnabled) { + if ((isDozeEnabled() && (mHandwaveGestureEnabled || mPocketGestureEnabled)) { mSensorManager.registerListener(this, mSensor, SensorManager.SENSOR_DELAY_NORMAL); } } @@ -171,7 +165,6 @@ public class SamsungDozeService extends Service { private void loadPreferences(SharedPreferences sharedPreferences) { mHandwaveGestureEnabled = sharedPreferences.getBoolean(GESTURE_HAND_WAVE_KEY, false); mPocketGestureEnabled = sharedPreferences.getBoolean(GESTURE_POCKET_KEY, false); - mProximityWakeEnabled = sharedPreferences.getBoolean(PROXIMITY_WAKE_KEY, false); } private BroadcastReceiver mScreenStateReceiver = new BroadcastReceiver() { @@ -193,8 +186,6 @@ public class SamsungDozeService extends Service { mHandwaveGestureEnabled = sharedPreferences.getBoolean(GESTURE_HAND_WAVE_KEY, false); } else if (GESTURE_POCKET_KEY.equals(key)) { mPocketGestureEnabled = sharedPreferences.getBoolean(GESTURE_POCKET_KEY, false); - } else if (PROXIMITY_WAKE_KEY.equals(key)) { - mProximityWakeEnabled = sharedPreferences.getBoolean(PROXIMITY_WAKE_KEY, false); } } }; diff --git a/doze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java b/doze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java index 2954438f..4f57da09 100644 --- a/doze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java +++ b/doze/src/org/lineageos/settings/doze/TouchscreenGestureSettings.java @@ -18,34 +18,19 @@ package org.lineageos.settings.doze; import android.app.ActionBar; import android.os.Bundle; -import android.provider.Settings; import android.view.MenuItem; -import androidx.preference.Preference; + import androidx.preference.PreferenceFragment; -import androidx.preference.SwitchPreference; import org.lineageos.internal.util.ScreenType; public class TouchscreenGestureSettings extends PreferenceFragment { - private static final String KEY_HAND_WAVE = "gesture_hand_wave"; - private static final String KEY_PROXIMITY_WAKE = "proximity_wake_enable"; - - private SwitchPreference mHandwavePreference; - private SwitchPreference mProximityWakePreference; - @Override public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { addPreferencesFromResource(R.xml.gesture_panel); final ActionBar actionBar = getActivity().getActionBar(); actionBar.setDisplayHomeAsUpEnabled(true); - - mHandwavePreference = - (SwitchPreference) findPreference(KEY_HAND_WAVE); - mHandwavePreference.setOnPreferenceChangeListener(mProximityListener); - mProximityWakePreference = - (SwitchPreference) findPreference(KEY_PROXIMITY_WAKE); - mProximityWakePreference.setOnPreferenceChangeListener(mProximityListener); } @Override @@ -58,21 +43,6 @@ public class TouchscreenGestureSettings extends PreferenceFragment { } } - private Preference.OnPreferenceChangeListener mProximityListener = - new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - if ((boolean) newValue) { - if (preference.getKey().equals(KEY_HAND_WAVE)) { - mProximityWakePreference.setChecked(false); - } else if (preference.getKey().equals(KEY_PROXIMITY_WAKE)) { - mHandwavePreference.setChecked(false); - } - } - return true; - } - }; - @Override public boolean onOptionsItemSelected(MenuItem item) { if (item.getItemId() == android.R.id.home) {