Merge "Fix Assist Gesture settings check" into oc-dr1-dev am: d0487eff5e

am: 6d41ab7958

Change-Id: I6f4bdd8e1f18870c027c578fc9c1a1e4143da7d5
This commit is contained in:
Kevin Chyn
2017-07-07 03:57:30 +00:00
committed by android-build-merger

View File

@@ -65,9 +65,12 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
public void displayPreference(PreferenceScreen screen) {
mScreen = screen;
mPreference = screen.findPreference(getPreferenceKey());
if (!mFeatureProvider.isSensorAvailable(mContext)) {
removePreference(mScreen, getPreferenceKey());
return;
}
if (!mFeatureProvider.isSupported(mContext)) {
mScreen.removePreference(mPreference);
removePreference(mScreen, getPreferenceKey());
return;
}
// Call super last or AbstractPreferenceController might remove the preference from the