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

Merge "[Network Connection] Implement Unavailable callback when the user cancels"

Browse Source
This commit is contained in:
TreeHugger Robot
2019-03-21 05:48:17 +00:00
committed by Android (Google) Code Review
parent ea3a25ea83 5944fa9427
commit 4a6b8a608c
2 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/wifi/NetworkRequestDialogFragment.java
View File

@@ -124,7 +124,7 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp
final AlertDialog.Builder builder = new AlertDialog.Builder(context)
.setCustomTitle(customTitle)
.setAdapter(mDialogAdapter, this)
.setNegativeButton(R.string.cancel, (dialog, which) -> getActivity().finish())
.setNegativeButton(R.string.cancel, (dialog, which) -> onCancel(dialog))
// Do nothings, will replace the onClickListener to avoid auto closing dialog.
.setNeutralButton(R.string.network_connection_request_dialog_showall,
null /* OnClickListener */);
@@ -221,6 +221,9 @@ public class NetworkRequestDialogFragment extends InstrumentedDialogFragment imp
if (getActivity() != null) {
getActivity().finish();
}
if (mUserSelectionCallback != null) {
mUserSelectionCallback.reject();
}
}
@Override