Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only call negative listener when SaveUI is dismissed by tapping button." into oc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2017-09-21 20:44:50 +00:00
committed by Android (Google) Code Review
parent a120e6b604 620a6cedde
commit e8041834b1
1 changed files with 1 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
services/autofill/java/com/android/server/autofill/ui/SaveUi.java
View File

@@ -263,9 +263,7 @@ final class SaveUi {
} else { } else {
noButton.setText(R.string.autofill_save_no); noButton.setText(R.string.autofill_save_no);
} }
final View.OnClickListener cancelListener = noButton.setOnClickListener((v) -> mListener.onCancel(info.getNegativeActionListener()));
(v) -> mListener.onCancel(info.getNegativeActionListener());
noButton.setOnClickListener(cancelListener);
final View yesButton = view.findViewById(R.id.autofill_save_yes); final View yesButton = view.findViewById(R.id.autofill_save_yes);
yesButton.setOnClickListener((v) -> mListener.onSave()); yesButton.setOnClickListener((v) -> mListener.onSave());
@@ -273,9 +271,6 @@ final class SaveUi {
mDialog = new Dialog(context, R.style.Theme_DeviceDefault_Light_Panel); mDialog = new Dialog(context, R.style.Theme_DeviceDefault_Light_Panel);
mDialog.setContentView(view); mDialog.setContentView(view);
// Dialog can be dismissed when touched outside.
mDialog.setOnDismissListener((d) -> mListener.onCancel(info.getNegativeActionListener()));
final Window window = mDialog.getWindow(); final Window window = mDialog.getWindow();
window.setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY); window.setType(WindowManager.LayoutParams.TYPE_APPLICATION_OVERLAY);
window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE window.addFlags(WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE