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

@@ -13,7 +13,6 @@
*/
package com.android.settings.nfc;
import android.app.AlertDialog;
import android.app.Dialog;
import android.content.ActivityNotFoundException;
import android.content.Context;
@@ -39,6 +38,7 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
import java.util.List;
import androidx.appcompat.app.AlertDialog.Builder;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import androidx.preference.PreferenceViewHolder;
@@ -134,7 +134,7 @@ public class NfcPaymentPreferenceController extends BasePreferenceController imp
}
@Override
public void onPrepareDialogBuilder(AlertDialog.Builder builder,
public void onPrepareDialogBuilder(Builder builder,
DialogInterface.OnClickListener listener) {
builder.setSingleChoiceItems(mAdapter, 0, listener);
}