diff options
| author | Chiao Cheng <chiaocheng@google.com> | 2013-11-13 21:21:43 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-11-13 21:21:44 +0000 |
| commit | 759c264e87cb746f80b1524a40203197150e00bb (patch) | |
| tree | 4d05e8b9f1e156620a3b14c5d8b285836ca0a19f | |
| parent | c3cb63b627b30e7bebd88dab2583604eb4e7fa88 (diff) | |
| parent | a4ef50949a828e5757cbf8fceeb235c84e38d818 (diff) | |
Merge "Dismiss dialpad when user touches spaces above it." into klp-dev
| -rw-r--r-- | res/layout/dialpad_fragment.xml | 3 | ||||
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 14 |
2 files changed, 16 insertions, 1 deletions
diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml index 32b1d6094..e673cea98 100644 --- a/res/layout/dialpad_fragment.xml +++ b/res/layout/dialpad_fragment.xml @@ -19,7 +19,8 @@ android:layout_height="match_parent" android:orientation="vertical" > <!-- spacer view --> - <Space + <View + android:id="@+id/spacer" android:layout_width="match_parent" android:layout_height="0dp" android:layout_weight="1" /> diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 9ebf1121c..00b8281a7 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -206,6 +206,8 @@ public class DialpadFragment extends Fragment private ToneGenerator mToneGenerator; private final Object mToneGeneratorLock = new Object(); private View mDialpad; + private View mSpacer; + /** * Set of dialpad keys that are currently being pressed */ @@ -428,6 +430,18 @@ public class DialpadFragment extends Fragment mDelete.setOnLongClickListener(this); } + mSpacer = fragmentView.findViewById(R.id.spacer); + mSpacer.setOnTouchListener(new View.OnTouchListener() { + @Override + public boolean onTouch(View v, MotionEvent event) { + if (isDigitsEmpty()) { + hideAndClearDialpad(); + return true; + } + return false; + } + }); + mDialpad = fragmentView.findViewById(R.id.dialpad); // This is null in landscape mode. // In landscape we put the keyboard in phone mode. |