commit 408efb26f0d2b7993cbf63d0fa2d3bbce3893abf
author Kevin Chyn <kchyn@google.com> Sat Jul 01 03:06:52 2017 +0000
committer android-build-merger <android-build-merger@google.com> Sat Jul 01 03:06:52 2017 +0000
tree 0cdca1a87d88bb77f15f384720711018743707ba
parent 33a91c5004ac8637dde93e208d605bc3e5a7220d
parent 72a94e9f5a9fe98c2d2d0383db91e73ab41f77cd

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

Change-Id: I7748c0537a6eebb1fd460b3039a9a53dc070e19e

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