1 files changed, 12 insertions, 0 deletions
diff --git a/java/com/android/dialershared/bubble/Bubble.java b/java/com/android/dialershared/bubble/Bubble.java
index cd2c9fc57..d24552245 100644
--- a/java/com/android/dialershared/bubble/Bubble.java
+++ b/java/com/android/dialershared/bubble/Bubble.java
@@ -241,6 +241,7 @@ public class Bubble {
       viewHolder.getPrimaryButton().setScaleY(0);
     }
 
+    viewHolder.setChildClickable(true);
     visibility = Visibility.ENTERING;
     viewHolder
         .getPrimaryButton()
@@ -495,6 +496,9 @@ public class Bubble {
       return;
     }
 
+    // Make bubble non clickable to prevent further buggy actions
+    viewHolder.setChildClickable(false);
+
     if (textShowing) {
       hideAfterText = true;
       return;
@@ -822,6 +826,14 @@ public class Bubble {
       moveHandler = new MoveHandler(primaryButton, Bubble.this);
     }
 
+    private void setChildClickable(boolean clickable) {
+      firstButton.setClickable(clickable);
+      secondButton.setClickable(clickable);
+      thirdButton.setClickable(clickable);
+
+      primaryButton.setOnTouchListener(clickable ? moveHandler : null);
+    }
+
     public ViewGroup getRoot() {
       return root;
     }