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

Improvements on ACTION_REQUEST_SET_AUTOFILL_SERVICE:

Browse Source 
- Moved to proper package.
- Returns right away when:
  - AutofillService for package is already selected
  - Autofill is not available

Bug: 37576671
Bug: 37673809

Test: manual verification
Test: make RunSettingsRoboTests -j90

Merged-in: Icda260cea1b4ce6cdefd8eff9625b2b768a5ed86
Change-Id: Icda260cea1b4ce6cdefd8eff9625b2b768a5ed86
This commit is contained in:
Felipe Leme
2017-04-25 16:42:55 -07:00
parent fdd8d3f6ae
commit aa7a23b40d
5 changed files with 137 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,8 +55,8 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
if (TextUtils.isEmpty(confirmationMessage)) {
super.onRadioButtonClicked(selected);
} else if (activity != null) {
final DialogFragment fragment = ConfirmationDialogFragment.newInstance(
this, selectedKey, confirmationMessage);
final DialogFragment fragment =
newConfirmationDialogFragment(selectedKey, confirmationMessage);
fragment.show(activity.getFragmentManager(), ConfirmationDialogFragment.TAG);
}
}
@@ -74,6 +74,11 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
}
}
protected ConfirmationDialogFragment newConfirmationDialogFragment(String selectedKey,
CharSequence confirmationMessage) {
return ConfirmationDialogFragment.newInstance(this, selectedKey, confirmationMessage);
}
protected CharSequence getConfirmationMessage(CandidateInfo info) {
return null;
}
@@ -85,6 +90,12 @@ 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;
}
@Override
public int getMetricsCategory() {
return MetricsProto.MetricsEvent.DEFAULT_APP_PICKER_CONFIRMATION_DIALOG;
@@ -92,7 +103,14 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
public static ConfirmationDialogFragment newInstance(DefaultAppPickerFragment parent,
String key, CharSequence message) {
final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment();
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);
final Bundle argument = new Bundle();
argument.putString(EXTRA_KEY, key);
argument.putCharSequence(EXTRA_MESSAGE, message);
@@ -107,7 +125,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
.setMessage(bundle.getCharSequence(EXTRA_MESSAGE))
.setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, null);
.setNegativeButton(android.R.string.cancel, mCancelListener);
return builder.create();
}