1 files changed, 9 insertions, 11 deletions
diff --git a/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java b/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java
index 860d2d282..9fd3aed5b 100644
--- a/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java
+++ b/java/com/android/incallui/audioroute/AudioRouteSelectorDialogFragment.java
@@ -27,7 +27,6 @@ import android.support.design.widget.BottomSheetDialogFragment;
 import android.telecom.CallAudioState;
 import android.view.LayoutInflater;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.TextView;
@@ -92,12 +91,14 @@ public class AudioRouteSelectorDialogFragment extends BottomSheetDialogFragment
         (TextView) view.findViewById(R.id.audioroute_earpiece),
         CallAudioState.ROUTE_EARPIECE,
         audioState);
+
+    // TODO(b/67013452): set peak height correctly to fully expand it in landscape mode.
     return view;
   }
 
   @Override
-  public void onDismiss(DialogInterface dialogInterface) {
-    super.onDismiss(dialogInterface);
+  public void onCancel(DialogInterface dialogInterface) {
+    super.onCancel(dialogInterface);
     FragmentUtils.getParentUnsafe(
             AudioRouteSelectorDialogFragment.this, AudioRouteSelectorPresenter.class)
         .onAudioRouteSelectorDismiss();
@@ -113,14 +114,11 @@ public class AudioRouteSelectorDialogFragment extends BottomSheetDialogFragment
       item.setCompoundDrawableTintMode(Mode.SRC_ATOP);
     }
     item.setOnClickListener(
-        new OnClickListener() {
-          @Override
-          public void onClick(View v) {
-            dismiss();
-            FragmentUtils.getParentUnsafe(
-                    AudioRouteSelectorDialogFragment.this, AudioRouteSelectorPresenter.class)
-                .onAudioRouteSelected(itemRoute);
-          }
+        (v) -> {
+          dismiss();
+          FragmentUtils.getParentUnsafe(
+                  AudioRouteSelectorDialogFragment.this, AudioRouteSelectorPresenter.class)
+              .onAudioRouteSelected(itemRoute);
         });
   }
 }