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

Merge "Update the strings for the autofill enable dialog" into oc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-13 01:56:05 +00:00
committed by Android (Google) Code Review
parent 9aa9976541 4fafa4e403
commit 0770f85cdc
3 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -50,7 +50,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
@Override
public void onRadioButtonClicked(RadioButtonPreference selected) {
final String selectedKey = selected.getKey();
final String confirmationMessage = getConfirmationMessage(getCandidate(selectedKey));
final CharSequence confirmationMessage = getConfirmationMessage(getCandidate(selectedKey));
final Activity activity = getActivity();
if (TextUtils.isEmpty(confirmationMessage)) {
super.onRadioButtonClicked(selected);
@@ -74,7 +74,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
}
}
protected String getConfirmationMessage(CandidateInfo info) {
protected CharSequence getConfirmationMessage(CandidateInfo info) {
return null;
}
@@ -91,11 +91,11 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
}
public static ConfirmationDialogFragment newInstance(DefaultAppPickerFragment parent,
String key, String message) {
String key, CharSequence message) {
final ConfirmationDialogFragment fragment = new ConfirmationDialogFragment();
final Bundle argument = new Bundle();
argument.putString(EXTRA_KEY, key);
argument.putString(EXTRA_MESSAGE, message);
argument.putCharSequence(EXTRA_MESSAGE, message);
fragment.setArguments(argument);
fragment.setTargetFragment(parent, 0);
return fragment;
@@ -105,7 +105,7 @@ public abstract class DefaultAppPickerFragment extends RadioButtonPickerFragment
public Dialog onCreateDialog(Bundle savedInstanceState) {
final Bundle bundle = getArguments();
final AlertDialog.Builder builder = new AlertDialog.Builder(getActivity())
.setMessage(bundle.getString(EXTRA_MESSAGE))
.setMessage(bundle.getCharSequence(EXTRA_MESSAGE))
.setPositiveButton(android.R.string.ok, this)
.setNegativeButton(android.R.string.cancel, null);
return builder.create();

7
src/com/android/settings/applications/defaultapps/DefaultAutofillPicker.java
View File

@@ -24,6 +24,7 @@ import android.content.pm.ServiceInfo;
import android.provider.Settings;
import android.service.autofill.AutofillService;
import android.service.autofill.AutofillServiceInfo;
import android.text.Html;
import android.text.TextUtils;
import com.android.internal.logging.nano.MetricsProto;
@@ -65,12 +66,14 @@ public class DefaultAutofillPicker extends DefaultAppPickerFragment {
}
@Override
protected String getConfirmationMessage(CandidateInfo appInfo) {
protected CharSequence getConfirmationMessage(CandidateInfo appInfo) {
if (appInfo == null) {
return null;
}
final CharSequence appName = appInfo.loadLabel();
return getContext().getString(R.string.autofill_confirmation_message, appName);
final String message = getContext().getString(
R.string.autofill_confirmation_message, appName);
return Html.fromHtml(message);
}
@Override