diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-07 17:44:03 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-07 17:44:03 +0000 |
commit | 2cb0136378f1e2930b81399da1bd606dc478e0b3 (patch) | |
tree | 2e633f463df6dbddf97914a6073c8fa39a706241 /java/com/android/dialershared/bubble | |
parent | dc6e00fac8ff2e288e42094c77d66a61987b0cd2 (diff) | |
parent | af3cc176cdc652a05645cab9ad213696970c6e4d (diff) |
Merge changes I2f94d863,Id7f5ce4b,I1c0b5b42,I4d8d8de8,I3765a9ae, ...
* changes:
Added search actions to the end of the dialpad search results.
Disable action on bubble when hiding, and reable it when showing.
Improved behavior of back button in search ui.
Fix crash when Context is null in InCallPresenter
Bump version code and name to Dialer v12.1 and Dialer v13 (again).
Adding dialer specific transcription error codes
Removes the unused dialer/app/filterednumber package.
Ignore invalid action for LegacyVociemailNotificationReceiver
Diffstat (limited to 'java/com/android/dialershared/bubble')
-rw-r--r-- | java/com/android/dialershared/bubble/Bubble.java | 12 |
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; } |