Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9d19153 authored by Chiao Cheng's avatar Chiao Cheng Committed by Android Git Automerger
Browse files

am 759c264e: Merge "Dismiss dialpad when user touches spaces above it." into klp-dev

* commit '759c264e':
  Dismiss dialpad when user touches spaces above it.
parents 8e578cfe 759c264e
Loading
Loading
Loading
Loading
+2 −1
Original line number Diff line number Diff line
@@ -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" />
+14 −0
Original line number Diff line number Diff line
@@ -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.