Make PreferenceController a mixin
Bug: 62912136 Test: Existing tests in BaseSearchIndexProviderTest Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
This commit is contained in:
@@ -25,13 +25,15 @@ import android.support.v7.preference.PreferenceScreen;
|
||||
import android.text.TextUtils;
|
||||
import android.view.InputDevice;
|
||||
|
||||
import com.android.settings.core.PreferenceController;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||
import com.android.settingslib.core.lifecycle.events.OnPause;
|
||||
import com.android.settingslib.core.lifecycle.events.OnResume;
|
||||
|
||||
public class GameControllerPreferenceController extends PreferenceController
|
||||
implements InputManager.InputDeviceListener, LifecycleObserver, OnResume, OnPause {
|
||||
public class GameControllerPreferenceController extends AbstractPreferenceController
|
||||
implements PreferenceControllerMixin, InputManager.InputDeviceListener, LifecycleObserver,
|
||||
OnResume, OnPause {
|
||||
|
||||
public static final String PREF_KEY = "vibrate_input_devices";
|
||||
private static final String CATEGORY_KEY = "game_controller_settings_category";
|
||||
|
@@ -21,8 +21,9 @@ import android.hardware.input.InputManager;
|
||||
import android.support.v7.preference.Preference;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.PreferenceController;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settings.inputmethod.PhysicalKeyboardFragment.HardKeyboardDeviceInfo;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||
import com.android.settingslib.core.lifecycle.events.OnPause;
|
||||
@@ -30,8 +31,9 @@ import com.android.settingslib.core.lifecycle.events.OnResume;
|
||||
|
||||
import java.util.List;
|
||||
|
||||
public class PhysicalKeyboardPreferenceController extends PreferenceController implements
|
||||
LifecycleObserver, OnResume, OnPause, InputManager.InputDeviceListener {
|
||||
public class PhysicalKeyboardPreferenceController extends AbstractPreferenceController
|
||||
implements PreferenceControllerMixin, LifecycleObserver, OnResume, OnPause,
|
||||
InputManager.InputDeviceListener {
|
||||
|
||||
private final InputManager mIm;
|
||||
|
||||
|
@@ -23,10 +23,12 @@ import android.view.textservice.SpellCheckerInfo;
|
||||
import android.view.textservice.TextServicesManager;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.PreferenceController;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
|
||||
|
||||
public class SpellCheckerPreferenceController extends PreferenceController {
|
||||
public class SpellCheckerPreferenceController extends AbstractPreferenceController
|
||||
implements PreferenceControllerMixin {
|
||||
|
||||
public static final String KEY_SPELL_CHECKERS = "spellcheckers_settings";
|
||||
|
||||
|
@@ -25,12 +25,14 @@ import android.view.inputmethod.InputMethodInfo;
|
||||
import android.view.inputmethod.InputMethodManager;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.core.PreferenceController;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
|
||||
public class VirtualKeyboardPreferenceController extends PreferenceController {
|
||||
public class VirtualKeyboardPreferenceController extends AbstractPreferenceController
|
||||
implements PreferenceControllerMixin {
|
||||
|
||||
private final InputMethodManager mImm;
|
||||
private final DevicePolicyManager mDpm;
|
||||
|
Reference in New Issue
Block a user