commit 1c4b47f4ebf645325e0ccf45ff287c16ef534646
author Adrian Roos <roosa@google.com> Mon Apr 13 14:53:32 2015 -0700
committer Adrian Roos <roosa@google.com> Tue Apr 14 11:53:20 2015 -0700
tree ccc567b264052ed97327784cdc9889e2c9e69565
parent 9feec443074ecb9a9c782343d2e5d1d5ee27dcfa

Improve anti-falsing on emergency dialer

Bug: 19841919
Change-Id: Iba453e50e1cebc507ab8cb2caa599e863b3910cc

src/com/android/phone/EmergencyDialer.java

diff --git a/src/com/android/phone/EmergencyDialer.java b/src/com/android/phone/EmergencyDialer.java
index 6995d89..b9597c1 100644
--- a/src/com/android/phone/EmergencyDialer.java
+++ b/src/com/android/phone/EmergencyDialer.java
@@ -40,6 +40,7 @@
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.MenuItem;
+import android.view.MotionEvent;
 import android.view.View;
 import android.view.WindowManager;
 import android.view.accessibility.AccessibilityManager;
@@ -115,6 +116,8 @@
     // Haptic feedback (vibration) for dialer key presses.
     private HapticFeedback mHaptic = new HapticFeedback();
 
+    private EmergencyActionGroup mEmergencyActionGroup;
+
     // close activity when screen turns off
     private BroadcastReceiver mBroadcastReceiver = new BroadcastReceiver() {
         @Override
@@ -239,6 +242,8 @@
         } catch (Resources.NotFoundException nfe) {
              Log.e(LOG_TAG, "Vibrate control bool missing.", nfe);
         }
+
+        mEmergencyActionGroup = (EmergencyActionGroup) findViewById(R.id.emergency_action_group);
     }
 
     @Override
@@ -340,6 +345,14 @@
     }
 
     @Override
+    public boolean dispatchTouchEvent(MotionEvent ev) {
+        mEmergencyActionGroup.onPreTouchEvent(ev);
+        boolean handled = super.dispatchTouchEvent(ev);
+        mEmergencyActionGroup.onPostTouchEvent(ev);
+        return handled;
+    }
+
+    @Override
     public void onClick(View view) {
         switch (view.getId()) {
             case R.id.deleteButton: {