PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
am: d0487eff5e

Change-Id: I609448c301e3c28a2362a884b01a196912c4c7b8
This commit is contained in:
Kevin Chyn
2017-07-07 03:49:36 +00:00
committed by android-build-merger
parent 7d46906218 d0487eff5e
commit 6d41ab7958
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/gestures/AssistGesturePreferenceController.java
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