Commit fe38f471 authored by Jun Cai's avatar Jun Cai Committed by Commit Bot

Device API: Use setOnCancelListener when chooser dialog is canceled without user action

This is a follow-up CL from the comment at:
https://chromium-review.googlesource.com/c/chromium/src/+/1622706/8/chrome/android/java/src/org/chromium/chrome/browser/ItemChooserDialog.java#601

This CL uses setOnCancelListener instead of setOnDismissListener for the
dialog cancel event (without user action).

Bug: None
Change-Id: I5d7c609d585da07dbbd759574efb0dc741d1db55
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1682669Reviewed-by: default avatarBecky Zhou <huayinz@chromium.org>
Reviewed-by: default avatarTheresa <twellington@chromium.org>
Commit-Queue: Jun Cai <juncai@chromium.org>
Cr-Commit-Position: refs/heads/master@{#675733}
parent 4cc4e580
...@@ -247,7 +247,7 @@ public class ItemChooserDialog implements DeviceItemAdapter.Observer { ...@@ -247,7 +247,7 @@ public class ItemChooserDialog implements DeviceItemAdapter.Observer {
mDialog.addContentView(view, mDialog.addContentView(view,
new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT, new LinearLayout.LayoutParams(LinearLayout.LayoutParams.MATCH_PARENT,
LinearLayout.LayoutParams.MATCH_PARENT)); LinearLayout.LayoutParams.MATCH_PARENT));
mDialog.setOnDismissListener(dialog -> mItemSelectedCallback.onItemSelected("")); mDialog.setOnCancelListener(dialog -> mItemSelectedCallback.onItemSelected(""));
Window window = mDialog.getWindow(); Window window = mDialog.getWindow();
if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) { if (!DeviceFormFactor.isNonMultiDisplayContextOnTablet(mActivity)) {
......
...@@ -204,7 +204,7 @@ public class BluetoothChooserDialogTest { ...@@ -204,7 +204,7 @@ public class BluetoothChooserDialogTest {
Assert.assertFalse(button.isEnabled()); Assert.assertFalse(button.isEnabled());
Assert.assertEquals(View.GONE, items.getVisibility()); Assert.assertEquals(View.GONE, items.getVisibility());
dialog.dismiss(); dialog.cancel();
CriteriaHelper.pollUiThread(new Criteria() { CriteriaHelper.pollUiThread(new Criteria() {
@Override @Override
......
...@@ -139,7 +139,7 @@ public class UsbChooserDialogTest { ...@@ -139,7 +139,7 @@ public class UsbChooserDialogTest {
Assert.assertFalse(button.isEnabled()); Assert.assertFalse(button.isEnabled());
Assert.assertEquals(View.GONE, items.getVisibility()); Assert.assertEquals(View.GONE, items.getVisibility());
dialog.dismiss(); dialog.cancel();
CriteriaHelper.pollUiThread(new Criteria() { CriteriaHelper.pollUiThread(new Criteria() {
@Override @Override
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment