commit 72a94e9f5a9fe98c2d2d0383db91e73ab41f77cd
author TreeHugger Robot <treehugger-gerrit@google.com> Sat Jul 01 02:59:19 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sat Jul 01 02:59:19 2017 +0000
tree fd26da04ec5d56ea8a8f099805a0174aac803643
parent 32a8568230c30589b667a7c09dd073c94d9d8032
parent 1db30b7749248bc91c0fb7ef2a70d58b4d876188

Merge "Assist gesture setting should not be available on unsupported devices" into oc-dr1-dev

src/com/android/settings/gestures/AssistGesturePreferenceController.java

diff --git a/src/com/android/settings/gestures/AssistGesturePreferenceController.java b/src/com/android/settings/gestures/AssistGesturePreferenceController.java
index 8bf660b..ede20c2 100644
--- a/src/com/android/settings/gestures/AssistGesturePreferenceController.java
+++ b/src/com/android/settings/gestures/AssistGesturePreferenceController.java
@@ -67,6 +67,7 @@
         mPreference = screen.findPreference(getPreferenceKey());
         if (!mFeatureProvider.isSupported(mContext)) {
             mScreen.removePreference(mPreference);
+            removePreference(mScreen, getPreferenceKey());
             return;
         }
         // Call super last or AbstractPreferenceController might remove the preference from the