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

Make PreferenceController a mixin

Browse Source 
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
This commit is contained in:
Tony Mantler
2017-06-13 13:09:25 -07:00
parent 4bac421538
commit 1d583e125f
203 changed files with 1027 additions and 782 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/com/android/settings/language/LanguageAndInputSettings.java
View File

@@ -35,7 +35,6 @@ import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.applications.defaultapps.DefaultAutofillPreferenceController;
import com.android.settings.core.PreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.gestures.AssistGestureFeatureProvider;
@@ -52,6 +51,7 @@ import com.android.settings.inputmethod.SpellCheckerPreferenceController;
import com.android.settings.inputmethod.VirtualKeyboardPreferenceController;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import java.util.ArrayList;
@@ -109,7 +109,7 @@ public class LanguageAndInputSettings extends DashboardFragment {
}
@Override
protected List<PreferenceController> getPreferenceControllers(Context context) {
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
if (mAmbientDisplayConfig == null) {
mAmbientDisplayConfig = new AmbientDisplayConfiguration(context);
}
@@ -117,10 +117,10 @@ public class LanguageAndInputSettings extends DashboardFragment {
return buildPreferenceControllers(context, getLifecycle(), mAmbientDisplayConfig);
}
private static List<PreferenceController> buildPreferenceControllers(@NonNull Context context,
private static List<AbstractPreferenceController> buildPreferenceControllers(@NonNull Context context,
@Nullable Lifecycle lifecycle,
@NonNull AmbientDisplayConfiguration ambientDisplayConfiguration) {
final List<PreferenceController> controllers = new ArrayList<>();
final List<AbstractPreferenceController> controllers = new ArrayList<>();
// Language
controllers.add(new PhoneLanguagePreferenceController(context));
controllers.add(new SpellCheckerPreferenceController(context));
@@ -216,7 +216,7 @@ public class LanguageAndInputSettings extends DashboardFragment {
}
@Override
public List<PreferenceController> getPreferenceControllers(Context context) {
public List<AbstractPreferenceController> getPreferenceControllers(Context context) {
return buildPreferenceControllers(context, null,
new AmbientDisplayConfiguration(context));
}

6
src/com/android/settings/language/PhoneLanguagePreferenceController.java
View File

@@ -19,10 +19,12 @@ package com.android.settings.language;
import android.content.Context;
import android.support.v7.preference.Preference;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.core.AbstractPreferenceController;
public class PhoneLanguagePreferenceController extends PreferenceController {
public class PhoneLanguagePreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
private static final String KEY_PHONE_LANGUAGE = "phone_language";

6
src/com/android/settings/language/TtsPreferenceController.java
View File

@@ -19,9 +19,11 @@ package com.android.settings.language;
import android.content.Context;
import android.speech.tts.TtsEngines;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
public class TtsPreferenceController extends PreferenceController {
public class TtsPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
private static final String KEY_VOICE_CATEGORY = "voice_category";
private static final String KEY_TTS_SETTINGS = "tts_settings_summary";

6
src/com/android/settings/language/UserDictionaryPreferenceController.java
View File

@@ -22,12 +22,14 @@ import android.os.Bundle;
import android.support.v7.preference.Preference;
import com.android.settings.UserDictionarySettings;
import com.android.settings.core.PreferenceController;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.inputmethod.UserDictionaryList;
import com.android.settingslib.core.AbstractPreferenceController;
import java.util.TreeSet;
public class UserDictionaryPreferenceController extends PreferenceController {
public class UserDictionaryPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin {
private static final String KEY_USER_DICTIONARY_SETTINGS = "key_user_dictionary_settings";