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

Merge "Fix search indexing for game controller "use vibrator"" into oc-mr1-dev

Browse Source 
am: 5e9b138691

Change-Id: Ie4577a62d3bd9219dd80cd22857b2eccdd9b410f
This commit is contained in:
Fan Zhang
2017-08-01 00:41:26 +00:00
committed by android-build-merger
parent 44a17e6c51 5e9b138691
commit 1f62645592
4 changed files with 37 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/android/settings/inputmethod/GameControllerPreferenceController.java
View File

@@ -19,6 +19,7 @@ package com.android.settings.inputmethod;
import android.content.Context;
import android.hardware.input.InputManager;
import android.provider.Settings;
import android.support.annotation.VisibleForTesting;
import android.support.v14.preference.SwitchPreference;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
@@ -31,11 +32,14 @@ import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnPause;
import com.android.settingslib.core.lifecycle.events.OnResume;
import java.util.List;
public class GameControllerPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin, InputManager.InputDeviceListener, LifecycleObserver,
OnResume, OnPause {
public static final String PREF_KEY = "vibrate_input_devices";
@VisibleForTesting
static final String PREF_KEY = "vibrate_input_devices";
private static final String CATEGORY_KEY = "game_controller_settings_category";
private final InputManager mIm;
@@ -105,6 +109,14 @@ public class GameControllerPreferenceController extends AbstractPreferenceContro
Settings.System.VIBRATE_INPUT_DEVICES, 1) > 0);
}
@Override
public void updateNonIndexableKeys(List<String> keys) {
if (!isAvailable()) {
keys.add(CATEGORY_KEY);
keys.add(PREF_KEY);
}
}
@Override
public void onInputDeviceAdded(int deviceId) {
updateGameControllers();