PartsBin: make offscreen gestures self-removing

Change-Id: Idcefc88b346499b3856d03a315a8daad730891df

3 files changed, 8 insertions, 7 deletions

diff --git a/res/values/config.xml b/res/values/config.xml
index d4d7b2c..cd2e086 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -24,7 +24,7 @@
     <bool name="config_device_supports_soundtuner">false</bool>
 
     <!-- Whether device supports offscreen gestures -->
-    <bool name="config_device_supports_gestures">true</bool>
+    <bool name="config_device_supports_gestures">false</bool>
 
     <!-- Whether device provides panel options -->
     <bool name="config_device_supports_panels">true</bool>
diff --git a/res/xml/main.xml b/res/xml/main.xml
index 5c029c5..df907a8 100644
--- a/res/xml/main.xml
+++ b/res/xml/main.xml
@@ -124,16 +124,17 @@
             android:title="@string/sweep_to_sleep_title"
             android:persistent="false" />
 
-        <Preference
+        <com.aicp.gear.preference.SelfRemovingPreference
             android:key="gesture_category"
             android:title="@string/category_gestures_title"
             android:icon="@drawable/ic_gesture"
             android:summary="@string/category_gestures_summary"
-            android:persistent="false" >
+            android:persistent="false"
+            aicpextras:requiresConfig="@bool/config_device_supports_gestures">
             <intent android:action="android.intent.action.MAIN"
                     android:targetPackage="com.aicp.device"
                     android:targetClass="com.aicp.device.GestureSettingsActivity" />
-        </Preference>
+        </com.aicp.gear.preference.SelfRemovingPreference>
     </PreferenceCategory>
 
     <com.aicp.gear.preference.SelfRemovingPreferenceCategory
diff --git a/src/com/aicp/device/DeviceSettings.java b/src/com/aicp/device/DeviceSettings.java
index cf95700..9ca4c64 100644
--- a/src/com/aicp/device/DeviceSettings.java
+++ b/src/com/aicp/device/DeviceSettings.java
@@ -46,6 +46,7 @@ import androidx.preference.PreferenceScreen;
 import androidx.preference.TwoStatePreference;
 import androidx.preference.SwitchPreference;
 
+import com.aicp.gear.preference.SelfRemovingPreference;
 import com.aicp.gear.preference.SelfRemovingPreferenceCategory;
 import com.android.internal.util.aicp.PackageUtils;
 
@@ -185,7 +186,6 @@ public class DeviceSettings extends PreferenceFragment implements
         }
 
         PreferenceCategory gesturesCategory = (PreferenceCategory) findPreference(KEY_GESTURES_CATEGORY);
-        mOffScreenGestures = (Preference) findPreference(KEY_OFFSCREEN_GESTURES);
         int gesturesRemoved = 0;
         mSTapSwitch = (TwoStatePreference) findPreference(KEY_STAP_SWITCH);
         if (mSTapSwitch != null && SingleTapSwitch.isSupported(getContext())){
@@ -223,8 +223,8 @@ public class DeviceSettings extends PreferenceFragment implements
             gesturesCategory.removePreference(mSweepToWakeSwitch);
             gesturesRemoved += 1;
         }
-        if (!supportsGestures) {
-            mOffScreenGestures.getParent().removePreference(mOffScreenGestures);
+        SelfRemovingPreference mOffScreenGestures = (SelfRemovingPreference) findPreference(KEY_OFFSCREEN_GESTURES);
+        if (mOffScreenGestures == null) {
             gesturesRemoved += 1;
         }
         if (gesturesRemoved == 5) gesturesCategory.getParent().removePreference(gesturesCategory);