summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2013-10-02 16:34:51 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-02 16:34:51 -0700
commit6c3ba0c14c67da725816ba6cdadabe2f0780bbd5 (patch)
tree4aa0f328aa67ace79bb985eef42e1a974d7712f7
parentd30b68e48634282daf00dfc9c0561d826379a961 (diff)
parent08b2ddc2dc99af8e461e78166a19f68fb6881ad7 (diff)
am 08b2ddc2: am 9e81b599: am 104f0cfa: Merge "Don\'t allow dialpad presses until it is fully in position" into klp-dev
* commit '08b2ddc2dc99af8e461e78166a19f68fb6881ad7': 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);