Depend on support lib preferences

Bug: 24576551
Change-Id: Ic6190bacd3f7582c9bbc8de972da4612bd92421e
This commit is contained in:
Jason Monk
2015-09-10 15:52:51 -04:00
parent 136ed7b6b2
commit 39b467482d
308 changed files with 2684 additions and 1762 deletions

View File

@@ -20,7 +20,7 @@ import android.content.ActivityNotFoundException;
import android.content.Context;
import android.content.DialogInterface;
import android.content.Intent;
import android.preference.DialogPreference;
import android.support.v7.preference.PreferenceViewHolder;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -29,13 +29,15 @@ import android.widget.BaseAdapter;
import android.widget.CompoundButton;
import android.widget.ImageView;
import android.widget.RadioButton;
import com.android.settings.CustomDialogPreference;
import com.android.settings.R;
import com.android.settings.nfc.PaymentBackend.PaymentAppInfo;
import java.util.List;
public class NfcPaymentPreference extends DialogPreference implements
DialogInterface.OnClickListener, PaymentBackend.Callback, View.OnClickListener {
public class NfcPaymentPreference extends CustomDialogPreference implements
PaymentBackend.Callback, View.OnClickListener {
private static final String TAG = "NfcPaymentPreference";
@@ -61,8 +63,8 @@ public class NfcPaymentPreference extends DialogPreference implements
}
@Override
protected void onBindView(View view) {
super.onBindView(view);
public void onBindViewHolder(PreferenceViewHolder view) {
super.onBindViewHolder(view);
mSettingsButtonView = (ImageView) view.findViewById(R.id.settings_button);
mSettingsButtonView.setOnClickListener(this);
@@ -90,10 +92,11 @@ public class NfcPaymentPreference extends DialogPreference implements
}
@Override
protected void onPrepareDialogBuilder(AlertDialog.Builder builder) {
super.onPrepareDialogBuilder(builder);
protected void onPrepareDialogBuilder(AlertDialog.Builder builder,
DialogInterface.OnClickListener listener) {
super.onPrepareDialogBuilder(builder, listener);
builder.setSingleChoiceItems(mAdapter, 0, this);
builder.setSingleChoiceItems(mAdapter, 0, listener);
}
@Override