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

3
src/com/android/settings/accessibility/AccessibilitySettingsForSetupWizardActivity.java
View File

@@ -27,6 +27,7 @@ import com.android.settings.support.actionbar.HelpResourceProvider;
import com.android.settingslib.core.instrumentation.Instrumentable;
import androidx.preference.Preference;
import androidx.preference.PreferenceFragmentCompat;
public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivity {
@@ -70,7 +71,7 @@ public class AccessibilitySettingsForSetupWizardActivity extends SettingsActivit
}
@Override
public boolean onPreferenceStartFragment(PreferenceFragment caller, Preference pref) {
public boolean onPreferenceStartFragment(PreferenceFragmentCompat caller, Preference pref) {
Bundle args = pref.getExtras();
if (args == null) {
args = new Bundle();

9
src/com/android/settings/accessibility/ListDialogPreference.java
View File

@@ -16,7 +16,6 @@
package com.android.settings.accessibility;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.Context;
import android.content.DialogInterface;
@@ -31,12 +30,14 @@ import android.widget.AbsListView;
import android.widget.AdapterView;
import android.widget.BaseAdapter;
import com.android.settingslib.CustomDialogPreference;
import com.android.settingslib.CustomDialogPreferenceCompat;
import androidx.appcompat.app.AlertDialog.Builder;
/**
* Abstract dialog preference that displays a set of values and optional titles.
*/
public abstract class ListDialogPreference extends CustomDialogPreference {
public abstract class ListDialogPreference extends CustomDialogPreferenceCompat {
private CharSequence[] mEntryTitles;
private int[] mEntryValues;
@@ -138,7 +139,7 @@ public abstract class ListDialogPreference extends CustomDialogPreference {
}
@Override
protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
protected void onPrepareDialogBuilder(Builder builder,
DialogInterface.OnClickListener listener) {
super.onPrepareDialogBuilder(builder, listener);

7
src/com/android/settings/accessibility/ShortcutServicePickerFragment.java
View File

@@ -22,7 +22,6 @@ import static com.android.internal.accessibility.AccessibilityShortcutController
.DALTONIZER_COMPONENT_NAME;
import android.accessibilityservice.AccessibilityServiceInfo;
import android.app.Activity;
import android.app.Dialog;
import android.content.ComponentName;
import android.content.Context;
@@ -55,6 +54,7 @@ import java.util.List;
import java.util.Map;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
/**
* Fragment for picking accessibility shortcut service
@@ -135,10 +135,11 @@ public class ShortcutServicePickerFragment extends RadioButtonPickerFragment {
// This is a framework feature. It doesn't need to be confirmed.
onRadioButtonConfirmed(selectedKey);
} else {
final Activity activity = getActivity();
final FragmentActivity activity = getActivity();
if (activity != null) {
ConfirmationDialogFragment.newInstance(this, selectedKey)
.show(activity.getFragmentManager(), ConfirmationDialogFragment.TAG);
.show(activity.getSupportFragmentManager(),
ConfirmationDialogFragment.TAG);
}
}
}