Settings Fragment Migration (Build pass app)

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

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);
}
}
}