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

am: 408efb26f0

Change-Id: I696511821f64f7bc09819cf1d45374125b7905c0
This commit is contained in:
Kevin Chyn
2017-07-01 03:11:52 +00:00
committed by android-build-merger

View File

@@ -67,6 +67,7 @@ public class AssistGesturePreferenceController extends GesturePreferenceControll
mPreference = screen.findPreference(getPreferenceKey()); mPreference = screen.findPreference(getPreferenceKey());
if (!mFeatureProvider.isSupported(mContext)) { if (!mFeatureProvider.isSupported(mContext)) {
mScreen.removePreference(mPreference); mScreen.removePreference(mPreference);
removePreference(mScreen, getPreferenceKey());
return; return;
} }
// Call super last or AbstractPreferenceController might remove the preference from the // Call super last or AbstractPreferenceController might remove the preference from the