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

Commit 7c8561d1 authored by Dmitri Plotnikov's avatar Dmitri Plotnikov
Browse files

Follow-up on preventing QC from hiding soft keyboard. 

- Making focus work just as before the fix, ie header is not focusable any more
- Making footer properly disappear before the track itself

Change-Id: I47f2cd72c7d1fe14d723de6a67293d2c66e2e06d
parent a0624488

src/com/android/contacts/ui/QuickContactWindow.java

+6 −8
Original line number Diff line number Diff line
@@ -133,7 +133,7 @@ public class QuickContactWindow implements Window.Callback, 
        @Override

        public boolean dispatchKeyEventPreIme(KeyEvent event) {

            if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {

                mQuickContactWindow.dismiss();

                mQuickContactWindow.onBackPressed();

                return true;

            } else {

                return super.dispatchKeyEventPreIme(event);
@@ -176,7 +176,6 @@ public class QuickContactWindow implements Window.Callback, 


    private int mMode;

    private RootLayout mRootView;

    private View mHeaderView;

    private View mHeader;

    private HorizontalScrollView mTrackScroll;

    private ViewGroup mTrack;
@@ -271,10 +270,9 @@ public class QuickContactWindow implements Window.Callback, 


        mRootView = (RootLayout)mWindow.findViewById(R.id.root);

        mRootView.mQuickContactWindow = this;



        mHeaderView = mWindow.findViewById(R.id.header);

        mHeaderView.setFocusable(true);

        mHeaderView.setFocusableInTouchMode(true);

        mRootView.setFocusable(true);

        mRootView.setFocusableInTouchMode(true);

        mRootView.setDescendantFocusability(RootLayout.FOCUS_AFTER_DESCENDANTS);



        mArrowUp = (ImageView)mWindow.findViewById(R.id.arrow_up);

        mArrowDown = (ImageView)mWindow.findViewById(R.id.arrow_down);
@@ -391,8 +389,8 @@ public class QuickContactWindow implements Window.Callback, 
        resetTrack();



        // We need to have a focused view inside the QuickContact window so

        // that the BACK key event can be delivered to the RootLayout

        mHeaderView.requestFocus();

        // that the BACK key event can be intercepted

        mRootView.requestFocus();



        mHasValidSocial = false;

        mDismissed = false;