summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristine Franks <christyfranks@google.com>2016-12-01 15:02:23 -0800
committerChristine Franks <christyfranks@google.com>2016-12-05 11:39:56 -0800
commit1473ddd74ba80c10db8232751ea0611cc8788747 (patch)
tree7a1fa2bd972967adca672b6d4a1230889834658e
parent7485df5052b1be0b397866fff010621cca956dc7 (diff)
downloadandroid_packages_apps_ExactCalculator-1473ddd74ba80c10db8232751ea0611cc8788747.tar.gz
android_packages_apps_ExactCalculator-1473ddd74ba80c10db8232751ea0611cc8788747.tar.bz2
android_packages_apps_ExactCalculator-1473ddd74ba80c10db8232751ea0611cc8788747.zip
Dismiss CAB when tap elsewhere
Bug: 33104975 Test: manual - open CAB, touch anywhere else on screen and CAB will dismiss itself. Change-Id: I2bfc981acb6b0d618daa42750ab625cce2f571d2
-rw-r--r--src/com/android/calculator2/Calculator.java11
1 files changed, 11 insertions, 0 deletions
diff --git a/src/com/android/calculator2/Calculator.java b/src/com/android/calculator2/Calculator.java
index 2f68f99..8452566 100644
--- a/src/com/android/calculator2/Calculator.java
+++ b/src/com/android/calculator2/Calculator.java
@@ -569,6 +569,17 @@ public class Calculator extends Activity
}
@Override
+ public boolean dispatchTouchEvent(MotionEvent e) {
+ if (e.getActionMasked() == MotionEvent.ACTION_DOWN) {
+ stopActionModeOrContextMenu();
+ if (mDragLayout.isOpen()) {
+ mHistoryFragment.stopActionModeOrContextMenu();
+ }
+ }
+ return super.dispatchTouchEvent(e);
+ }
+
+ @Override
public void onBackPressed() {
if (!stopActionModeOrContextMenu()) {
if (mDragLayout.isOpen()) {