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

Refactored ConfirmationDialogFragment to use default construcutor.

Browse Source 
Test: manual verification
Test: make RunSettingsRoboTests -j90

Fixes: 38397850

Change-Id: Ie724e7e92a6a34d4db16e4406bf821f00d98d180
This commit is contained in:
Felipe Leme
2017-05-18 14:32:13 -07:00
parent c7299663e7
commit e78e851fff
2 changed files with 41 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/applications/defaultapps/DefaultAppPickerFragment.java
View File

@@ -23,6 +23,7 @@ import android.app.DialogFragment;
import android.app.Fragment;
import android.content.Context;
import android.content.DialogInterface;
import android.content.DialogInterface.OnClickListener;
import android.os.Bundle;
import android.text.TextUtils;
@@ -76,7 +77,9 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
protected ConfirmationDialogFragment newConfirmationDialogFragment(String selectedKey,
CharSequence confirmationMessage) {
return ConfirmationDialogFragment.newInstance(this, selectedKey, confirmationMessage);
final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment();
fragment.init(this, selectedKey, confirmationMessage);
return fragment;
}
protected CharSequence getConfirmationMessage(CandidateInfo info) {
@@ -90,33 +93,29 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
public static final String EXTRA_KEY = "extra_key";
public static final String EXTRA_MESSAGE = "extra_message";
private final DialogInterface.OnClickListener mCancelListener;
private ConfirmationDialogFragment(DialogInterface.OnClickListener cancelListener) {
mCancelListener = cancelListener;
}
private DialogInterface.OnClickListener mCancelListener;
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
}
public static ConfirmationDialogFragment newInstance(DefaultAppPickerFragment parent,
String key, CharSequence message) {
return newInstance(parent, key, message, null);
}
// TODO: add test case for cancelListener
public static ConfirmationDialogFragment newInstance(DefaultAppPickerFragment parent,
String key, CharSequence message, DialogInterface.OnClickListener cancelListener) {
final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment(
cancelListener);
/**
* Initializes the fragment.
*
* <p>Should be called after it's constructed.
*/
public void init(DefaultAppPickerFragment parent, String key, CharSequence message) {
final Bundle argument = new Bundle();
argument.putString(EXTRA_KEY, key);
argument.putCharSequence(EXTRA_MESSAGE, message);
fragment.setArguments(argument);
fragment.setTargetFragment(parent, 0);
return fragment;
setArguments(argument);
setTargetFragment(parent, 0);
}
// TODO: add test case for cancelListener
public void setCancelListener(DialogInterface.OnClickListener cancelListener) {
this.mCancelListener = cancelListener;
}
@Override