summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-10-02 15:45:13 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-02 15:45:13 -0700
commit9e81b599a0d0d1194c220a5812fbdf41300231d4 (patch)
tree22a2bf1fe99927fb44827321f03f201a3c1d671c
parent41577efbe3998699ec456ed67918603f331dcf44 (diff)
parent104f0cfa58d88388c7e715c1b4fc3aa41bd4040d (diff)
am 104f0cfa: Merge "Don\'t allow dialpad presses until it is fully in position" into klp-dev
* commit '104f0cfa58d88388c7e715c1b4fc3aa41bd4040d': Don't allow dialpad presses until it is fully in position
-rw-r--r--src/com/android/dialer/dialpad/DialpadFragment.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java
index e46a8d3e1..46364b23c 100644
--- a/src/com/android/dialer/dialpad/DialpadFragment.java
+++ b/src/com/android/dialer/dialpad/DialpadFragment.java
@@ -807,6 +807,9 @@ public class DialpadFragment extends Fragment
}
private void keyPressed(int keyCode) {
+ if (getView().getTranslationY() != 0) {
+ return;
+ }
switch (keyCode) {
case KeyEvent.KEYCODE_1:
playTone(ToneGenerator.TONE_DTMF_1, TONE_LENGTH_INFINITE);