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

Settings Fragment Migration (Build pass app)

Browse Source 
This patch focused on fixing compile errors and some runtime errors.

Test: We can't test it now. But we will have an integration test later.
Bug: 110259478
Change-Id: I16c471ddcd0fa1460c665b7f74d86fcace5ee67b
This commit is contained in:
tmfang
2018-06-28 11:39:05 +08:00
committed by Fan Zhang
parent 99cc23d0da
commit 27c84de325
164 changed files with 792 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/inputmethod/AvailableVirtualKeyboardFragment.java
View File

@@ -38,7 +38,7 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtilCompat;
import com.android.settingslib.inputmethod.InputMethodPreference;
import com.android.settingslib.inputmethod.InputMethodSettingValuesWrapper;
import com.android.settingslib.search.SearchIndexable;
@@ -79,7 +79,7 @@ public final class AvailableVirtualKeyboardFragment extends SettingsPreferenceFr
public void onSaveInputMethodPreference(final InputMethodPreference pref) {
final boolean hasHardwareKeyboard = getResources().getConfiguration().keyboard
== Configuration.KEYBOARD_QWERTY;
InputMethodAndSubtypeUtil.saveInputMethodSubtypeList(this, getContentResolver(),
InputMethodAndSubtypeUtilCompat.saveInputMethodSubtypeList(this, getContentResolver(),
mImm.getInputMethodList(), hasHardwareKeyboard);
// Update input method settings and preference list.
mInputMethodSettingValues.refreshAllInputMethodAndSubtypes();
@@ -164,7 +164,7 @@ public final class AvailableVirtualKeyboardFragment extends SettingsPreferenceFr
final InputMethodPreference pref = mInputMethodPreferenceList.get(i);
pref.setOrder(i);
getPreferenceScreen().addPreference(pref);
InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference(pref);
InputMethodAndSubtypeUtilCompat.removeUnnecessaryNonPersistentPreference(pref);
pref.updatePreferenceViews();
}
}

11
src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceController.java
View File

@@ -22,25 +22,26 @@ import com.android.settings.core.BasePreferenceController;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
import com.android.settingslib.core.lifecycle.events.OnStop;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeEnablerManager;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeEnablerManagerCompat;
import androidx.preference.PreferenceFragmentCompat;
import androidx.preference.PreferenceScreen;
public class InputMethodAndSubtypePreferenceController extends BasePreferenceController implements
LifecycleObserver, OnStart, OnStop {
private PreferenceFragment mFragment;
private InputMethodAndSubtypeEnablerManager mManager;
private PreferenceFragmentCompat mFragment;
private InputMethodAndSubtypeEnablerManagerCompat mManager;
private String mTargetImi;
public InputMethodAndSubtypePreferenceController(Context context, String key) {
super(context, key);
}
public void initialize(PreferenceFragment fragment, String imi) {
public void initialize(PreferenceFragmentCompat fragment, String imi) {
mFragment = fragment;
mTargetImi = imi;
mManager = new InputMethodAndSubtypeEnablerManager(mFragment);
mManager = new InputMethodAndSubtypeEnablerManagerCompat(mFragment);
}
@Override

2
src/com/android/settings/inputmethod/KeyboardLayoutDialogFragment.java
View File

@@ -157,7 +157,7 @@ public class KeyboardLayoutDialogFragment extends InstrumentedDialogFragment
@Override
public void onActivityResult(int requestCode, int resultCode, Intent data) {
super.onActivityResult(requestCode, resultCode, data);
show(getActivity().getFragmentManager(), "layout");
show(getActivity().getSupportFragmentManager(), "layout");
}
private void onKeyboardLayoutClicked(int which) {

2
src/com/android/settings/inputmethod/PhysicalKeyboardFragment.java
View File

@@ -182,7 +182,7 @@ public final class PhysicalKeyboardFragment extends SettingsPreferenceFragment
KeyboardLayoutDialogFragment fragment = new KeyboardLayoutDialogFragment(
inputDeviceIdentifier);
fragment.setTargetFragment(this, 0);
fragment.show(getActivity().getFragmentManager(), "keyboardLayout");
fragment.show(getActivity().getSupportFragmentManager(), "keyboardLayout");
}
private void registerShowVirtualKeyboardSettingsObserver() {

2
src/com/android/settings/inputmethod/SpellCheckerPreference.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.inputmethod;
import android.app.AlertDialog.Builder;
import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.DialogInterface;
@@ -29,6 +28,7 @@ import android.view.textservice.SpellCheckerInfo;
import com.android.settings.CustomListPreference;
import com.android.settings.R;
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.preference.PreferenceViewHolder;
/**

4
src/com/android/settings/inputmethod/SpellCheckerPreferenceController.java
View File

@@ -23,7 +23,7 @@ import android.view.textservice.TextServicesManager;
import com.android.settings.R;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtilCompat;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
@@ -46,7 +46,7 @@ public class SpellCheckerPreferenceController extends AbstractPreferenceControll
super.displayPreference(screen);
final Preference preference = screen.findPreference(KEY_SPELL_CHECKERS);
if (preference != null) {
InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference(preference);
InputMethodAndSubtypeUtilCompat.removeUnnecessaryNonPersistentPreference(preference);
}
}

2
src/com/android/settings/inputmethod/UserDictionaryCursorLoader.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.inputmethod;
import android.content.Context;
import android.content.CursorLoader;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.provider.UserDictionary;
@@ -28,6 +27,7 @@ import java.util.Objects;
import java.util.Set;
import androidx.annotation.VisibleForTesting;
import androidx.loader.content.CursorLoader;
public class UserDictionaryCursorLoader extends CursorLoader {

4
src/com/android/settings/inputmethod/VirtualKeyboardFragment.java
View File

@@ -33,7 +33,7 @@ import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.search.Indexable;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtil;
import com.android.settingslib.inputmethod.InputMethodAndSubtypeUtilCompat;
import com.android.settingslib.inputmethod.InputMethodPreference;
import com.android.settingslib.search.SearchIndexable;
@@ -113,7 +113,7 @@ public final class VirtualKeyboardFragment extends SettingsPreferenceFragment im
final InputMethodPreference pref = mInputMethodPreferenceList.get(i);
pref.setOrder(i);
getPreferenceScreen().addPreference(pref);
InputMethodAndSubtypeUtil.removeUnnecessaryNonPersistentPreference(pref);
InputMethodAndSubtypeUtilCompat.removeUnnecessaryNonPersistentPreference(pref);
pref.updatePreferenceViews();
}
mAddVirtualKeyboardScreen.setIcon(R.drawable.ic_add_24dp);