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

Commit 1e53b98c authored by Bryce Lee's avatar Bryce Lee Committed by Android (Google) Code Review
Browse files

Merge "Allow press and hold from non-interactive." into lmp-mr1-modular-dev

parents 8deb6d95 82ae149f

core/res/res/values/config.xml

+2 −0
Original line number Diff line number Diff line
@@ -530,6 +530,8 @@ 
    <bool name="config_allowTheaterModeWakeFromWindowLayout">false</bool>

    <!-- If this is true, go to sleep when theater mode is enabled from button press -->

    <bool name="config_goToSleepOnButtonPressTheaterMode">true</bool>

    <!-- If this is true, long press on power button will be available from the non-interactive state -->

    <bool name="config_supportLongPressPowerWhenNonInteractive">false</bool>



    <!-- Auto-rotation behavior -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1615,6 +1615,7 @@ 
  <java-symbol type="bool" name="config_allowTheaterModeWakeFromDock" />

  <java-symbol type="bool" name="config_allowTheaterModeWakeFromWindowLayout" />

  <java-symbol type="bool" name="config_goToSleepOnButtonPressTheaterMode" />

  <java-symbol type="bool" name="config_supportLongPressPowerWhenNonInteractive" />

  <java-symbol type="bool" name="config_wifi_background_scan_support" />

  <java-symbol type="bool" name="config_wifi_dual_band_support" />

  <java-symbol type="bool" name="config_wimaxEnabled" />

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

+19 −4
Original line number Diff line number Diff line
@@ -536,6 +536,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    private boolean mAllowTheaterModeWakeFromLidSwitch;

    private boolean mAllowTheaterModeWakeFromWakeGesture;



    // Whether to support long press from power button in non-interactive mode

    private boolean mSupportLongPressPowerWhenNonInteractive;



    // Whether to go to sleep entering theater mode from power button

    private boolean mGoToSleepOnButtonPressTheaterMode;
@@ -887,6 +890,14 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                }

            } else {

                wakeUpFromPowerKey(event.getDownTime());



                if (mSupportLongPressPowerWhenNonInteractive && hasLongPressOnPowerBehavior()) {

                    Message msg = mHandler.obtainMessage(MSG_POWER_LONG_PRESS);

                    msg.setAsynchronous(true);

                    mHandler.sendMessageDelayed(msg,

                            ViewConfiguration.get(mContext).getDeviceGlobalActionKeyTimeout());

                    mBeganFromNonInteractive = true;

                } else {

                    final int maxCount = getMaxMultiPressPowerCount();



                    if (maxCount <= 1) {
@@ -897,6 +908,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                }

            }

        }

    }



    private void interceptPowerKeyUp(KeyEvent event, boolean interactive, boolean canceled) {

        final boolean handled = canceled || mPowerKeyHandled;
@@ -1262,6 +1274,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mGoToSleepOnButtonPressTheaterMode = mContext.getResources().getBoolean(

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



        mSupportLongPressPowerWhenNonInteractive = mContext.getResources().getBoolean(

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



        mShortPressOnPowerBehavior = mContext.getResources().getInteger(

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

        mLongPressOnPowerBehavior = mContext.getResources().getInteger(