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

Commit 8833bb17 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Disable Google's home-key handling code 

This might be temporary. Upstream now includes multi-behavior key
handling for HOME, which conflicts with our own code when running
in parallel, resulting in funky behaviors. Since the CM implementation
is more flexible, let's keep that for the time being and disable
Google's; It might be a good idea to rewrite our version so that it's
an extension of theirs, though.

Change-Id: I5d55301772607315b410880c1194a0076e21cb80
parent aae80a57

policy/src/com/android/internal/policy/impl/PhoneWindowManager.java

+4 −0
Original line number Diff line number Diff line
@@ -1221,6 +1221,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
     * eg. Disable long press on home goes to recents on sw600dp.

     */

    private void readConfigurationDependentBehaviors() {

        /* TEMP DISABLE: This conflicts with CM's own multi-behavior code 

        mLongPressOnHomeBehavior = mContext.getResources().getInteger(

                com.android.internal.R.integer.config_longPressOnHomeBehavior);

        if (mLongPressOnHomeBehavior < LONG_PRESS_HOME_NOTHING ||
@@ -1234,6 +1235,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                mDoubleTapOnHomeBehavior > DOUBLE_TAP_HOME_RECENT_SYSTEM_UI) {

            mDoubleTapOnHomeBehavior = LONG_PRESS_HOME_NOTHING;

        }

        */

    }



    @Override
@@ -2388,6 +2390,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    }

                }



                /* TEMP DISABLE: This conflicts with CM's own multi-behavior code 

                // Delay handling home if a double-tap is possible.

                if (mDoubleTapOnHomeBehavior != DOUBLE_TAP_HOME_NOTHING) {

                    mHandler.removeCallbacks(mHomeDoubleTapTimeoutRunnable); // just in case
@@ -2400,6 +2403,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                // Go home!

                launchHomeFromHotKey();

                return -1;

                */

            }



            // If a system window has focus, then it doesn't make sense