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

Commit f16b6256 authored by Jeff Brown's avatar Jeff Brown Committed by Android (Google) Code Review
Browse files

Merge "Allow "factory.long_press_power_off" to be toggled at runtime." into jb-mr1-dev

parents d8357cee 850c5b7c

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

+9 −9
Original line number Original line Diff line number Diff line
@@ -730,14 +730,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        public void run() {

        public void run() {

            // The context isn't read

            // The context isn't read

            if (mLongPressOnPowerBehavior < 0) {

            if (mLongPressOnPowerBehavior < 0) {

                if (FactoryTest.isLongPressOnPowerOffEnabled()) {

                    mLongPressOnPowerBehavior = LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM;

                } else {

                mLongPressOnPowerBehavior = mContext.getResources().getInteger(

                mLongPressOnPowerBehavior = mContext.getResources().getInteger(

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

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

            }

            }

            int resolvedBehavior = mLongPressOnPowerBehavior;

            if (FactoryTest.isLongPressOnPowerOffEnabled()) {

                resolvedBehavior = LONG_PRESS_POWER_SHUT_OFF_NO_CONFIRM;

            }

            }

            switch (mLongPressOnPowerBehavior) {



            switch (resolvedBehavior) {

            case LONG_PRESS_POWER_NOTHING:

            case LONG_PRESS_POWER_NOTHING:

                break;

                break;

            case LONG_PRESS_POWER_GLOBAL_ACTIONS:

            case LONG_PRESS_POWER_GLOBAL_ACTIONS:
@@ -753,8 +754,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                mPowerKeyHandled = true;

                mPowerKeyHandled = true;

                performHapticFeedbackLw(null, HapticFeedbackConstants.LONG_PRESS, false);

                performHapticFeedbackLw(null, HapticFeedbackConstants.LONG_PRESS, false);

                sendCloseSystemWindows(SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS);

                sendCloseSystemWindows(SYSTEM_DIALOG_REASON_GLOBAL_ACTIONS);

                mWindowManagerFuncs.shutdown(

                mWindowManagerFuncs.shutdown(resolvedBehavior == LONG_PRESS_POWER_SHUT_OFF);

                        mLongPressOnPowerBehavior == LONG_PRESS_POWER_SHUT_OFF);

                break;

                break;

            }

            }

        }

        }