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

Commit f71343dd authored by Jeff Brown's avatar Jeff Brown
Browse files

Fix regression in long-press home behavior on tablets. 

Some config.xml resources have values that vary based on the
configuration.  A previous change caused initialization to
occur at a time when the configuration is was not yet available.
This change fixes the problem.

Bug: 8891502
Change-Id: Ia768dc2308cc6ae5f11812c6bce6a6e116cfd759
parent 636af7a1

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

+23 −14
Original line number Diff line number Diff line
@@ -885,20 +885,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                com.android.internal.R.integer.config_lidNavigationAccessibility);

        mLidControlsSleep = mContext.getResources().getBoolean(

                com.android.internal.R.bool.config_lidControlsSleep);



        mLongPressOnHomeBehavior = mContext.getResources().getInteger(

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

        if (mLongPressOnHomeBehavior < LONG_PRESS_HOME_NOTHING ||

                mLongPressOnHomeBehavior > LONG_PRESS_HOME_ASSIST) {

            mLongPressOnHomeBehavior = LONG_PRESS_HOME_NOTHING;

        }



        mDoubleTapOnHomeBehavior = mContext.getResources().getInteger(

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

        if (mDoubleTapOnHomeBehavior < DOUBLE_TAP_HOME_NOTHING ||

                mDoubleTapOnHomeBehavior > DOUBLE_TAP_HOME_RECENT_SYSTEM_UI) {

            mDoubleTapOnHomeBehavior = LONG_PRESS_HOME_NOTHING;

        }

        readConfigurationDependentBehaviors();



        // register for dock events

        IntentFilter filter = new IntentFilter();
@@ -952,6 +939,27 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        }

    }



    /**

     * Read values from config.xml that may be overridden depending on

     * the configuration of the device.

     * eg. Disable long press on home goes to recents on sw600dp.

     */

    private void readConfigurationDependentBehaviors() {

        mLongPressOnHomeBehavior = mContext.getResources().getInteger(

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

        if (mLongPressOnHomeBehavior < LONG_PRESS_HOME_NOTHING ||

                mLongPressOnHomeBehavior > LONG_PRESS_HOME_ASSIST) {

            mLongPressOnHomeBehavior = LONG_PRESS_HOME_NOTHING;

        }



        mDoubleTapOnHomeBehavior = mContext.getResources().getInteger(

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

        if (mDoubleTapOnHomeBehavior < DOUBLE_TAP_HOME_NOTHING ||

                mDoubleTapOnHomeBehavior > DOUBLE_TAP_HOME_RECENT_SYSTEM_UI) {

            mDoubleTapOnHomeBehavior = LONG_PRESS_HOME_NOTHING;

        }

    }



    @Override

    public void setInitialDisplaySize(Display display, int width, int height, int density) {

        if (display.getDisplayId() != Display.DEFAULT_DISPLAY) {
@@ -1332,6 +1340,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            int navigationPresence) {

        mHaveBuiltInKeyboard = (keyboardPresence & PRESENCE_INTERNAL) != 0;



        readConfigurationDependentBehaviors();

        readLidState();

        applyLidSwitchState();