commit 9b590b22558a61cb5dadf0697fe6579c4c56a490
author maxwen <max.weninger@gmail.com> Fri May 04 23:32:00 2018 +0200
committer Max Weninger <max.weninger@gmail.com> Sat May 05 00:43:00 2018 +0100
tree 5c95b1937576fd93a1d775da5235963502f9394d
parent d2ec4a1ae92be746cbf5e4e8bedfd237740121b4

[2/2] OmniGears: generic proximity check for wakeup events

for devices that support deep sleep with active proximity
sensor event listener. Does cover power button and volume
button wake events

Change-Id: I27812a1fda8739272456609e89ab193e52ae6de1

res/values/custom_strings.xml

diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
index 8f79b98..0555e39 100644
--- a/res/values/custom_strings.xml
+++ b/res/values/custom_strings.xml
@@ -761,4 +761,7 @@
     <string name="lockscreen_weather_title">Show weather condition</string>
     <string name="lockscreen_weather_summary">Show current weather condition and temperature</string>
     <string name="lockscreen_items_aod_info_title">This visibility configuration also applies to the ambient display</string>
+
+    <string name="system_proxi_check_enabled_title">Proximity check</string>
+    <string name="system_proxi_check_enabled_summary">Check proximity sensor before handling power button and volume button wake events</string>
 </resources>

res/xml/button_settings.xml

diff --git a/res/xml/button_settings.xml b/res/xml/button_settings.xml
index bdbe49b..2d2360a 100644
--- a/res/xml/button_settings.xml
+++ b/res/xml/button_settings.xml
@@ -89,6 +89,12 @@
             android:summary="@string/long_press_power_torch_summary"
             android:defaultValue="false" />
 
+        <org.omnirom.omnigears.preference.SystemSettingSwitchPreference
+            android:key="system_proxi_check_enabled"
+            android:title="@string/system_proxi_check_enabled_title"
+            android:summary="@string/system_proxi_check_enabled_summary"
+            android:defaultValue="false"/>
+
     </PreferenceCategory>
 
     <PreferenceCategory

src/org/omnirom/omnigears/ButtonSettings.java

diff --git a/src/org/omnirom/omnigears/ButtonSettings.java b/src/org/omnirom/omnigears/ButtonSettings.java
index 5fa89c8..a6d3a92 100644
--- a/src/org/omnirom/omnigears/ButtonSettings.java
+++ b/src/org/omnirom/omnigears/ButtonSettings.java
@@ -54,6 +54,7 @@
 
     private static final String CATEGORY_KEYS = "button_keys";
     private static final String CATEGORY_OTHER = "button_other";
+    private static final String CATEGORY_POWER = "button_power";
     private static final String KEYS_SHOW_NAVBAR_KEY = "navigation_bar_show";
     private static final String KEYS_DISABLE_HW_KEY = "hardware_keys_disable";
     private static final String NAVIGATION_BAR_RECENTS_STYLE = "navbar_recents_style";
@@ -63,6 +64,7 @@
     private static final String BUTTON_BACK_KILL_TIMEOUT = "button_back_kill_timeout";
     private static final String KEY_BUTTON_LIGHT = "button_brightness";
     private static final String FINGERPRINT_VIB = "fingerprint_success_vib";
+    private static final String SYSTEM_PROXI_CHECK_ENABLED = "system_proxi_check_enabled";
 
     private ListPreference mNavbarRecentsStyle;
     private ListPreference mLongPressRecentsAction;
@@ -96,6 +98,8 @@
                 (PreferenceCategory) prefScreen.findPreference(CATEGORY_KEYS);
         final PreferenceCategory otherCategory =
                 (PreferenceCategory) prefScreen.findPreference(CATEGORY_OTHER);
+        final PreferenceCategory powerCategory =
+                (PreferenceCategory) prefScreen.findPreference(CATEGORY_POWER);
 
         mEnableNavBar = (SwitchPreference) prefScreen.findPreference(KEYS_SHOW_NAVBAR_KEY);
         mDisabkeHWKeys = (SwitchPreference) prefScreen.findPreference(KEYS_DISABLE_HW_KEY);
@@ -171,6 +175,12 @@
                     Settings.System.FINGERPRINT_SUCCESS_VIB, 1) == 1));
             mFingerprintVib.setOnPreferenceChangeListener(this);
         }
+
+        boolean supportPowerButtonProxyCheck = getResources().getBoolean(com.android.internal.R.bool.config_proxiSensorWakupCheck);
+        SwitchPreference proxyCheckPreference = (SwitchPreference) findPreference(SYSTEM_PROXI_CHECK_ENABLED);
+        if (!supportPowerButtonProxyCheck) {
+            powerCategory.removePreference(proxyCheckPreference);
+        }
     }
 
     @Override