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

Commit 2e76ccad authored by Joe Onorato's avatar Joe Onorato Committed by Android (Google) Code Review
Browse files

Merge "Long press on home shouldn't open recents"

parents 1e66008f 50262e58

core/res/res/values-xlarge/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
    <bool name="config_enableLockScreenRotation">true</bool>



    <!-- see comment in values/config.xml -->

    <integer name="config_longPressOnHomeBehavior">1</integer>

    <integer name="config_longPressOnHomeBehavior">0</integer>



</resources>

core/res/res/values/config.xml

+1 −1
Original line number Diff line number Diff line
@@ -355,7 +355,7 @@ 
            1 - Recent apps dialog

            2 - Recent apps activity in SystemUI

    -->

    <integer name="config_longPressOnHomeBehavior">0</integer>

    <integer name="config_longPressOnHomeBehavior">1</integer>



    <!-- Array of light sensor LUX values to define our levels for auto backlight brightness support.

         The N entries of this array define N + 1 zones as follows:

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

+1 −2
Original line number Diff line number Diff line
@@ -588,7 +588,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        // We can't initialize this in init() since the configuration hasn't been loaded yet.

        if (mLongPressOnHomeBehavior < 0) {

            mLongPressOnHomeBehavior

                    = mContext.getResources().getInteger(R.integer.config_longPressOnPowerBehavior);

                    = mContext.getResources().getInteger(R.integer.config_longPressOnHomeBehavior);

            if (mLongPressOnHomeBehavior < LONG_PRESS_HOME_NOTHING ||

                    mLongPressOnHomeBehavior > LONG_PRESS_HOME_RECENT_ACTIVITY) {

                mLongPressOnHomeBehavior = LONG_PRESS_HOME_NOTHING;
@@ -600,7 +600,6 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            sendCloseSystemWindows(SYSTEM_DIALOG_REASON_RECENT_APPS);

        }

        

        // Use 3d Recents dialog

        if (mLongPressOnHomeBehavior == LONG_PRESS_HOME_RECENT_DIALOG) {

            // Fallback to dialog if we fail to launch the above.

            if (mRecentAppsDialog == null) {