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

Commit e90585f8 authored by Christopher Tate's avatar Christopher Tate Committed by Mike Lockwood
Browse files

Add a config resource to disable key-chord screenshotting 

The key chord screenshot mechanism introduces significant latency into
processing of volume-key input; enough to be quite noticeable and
annoying on some kinds of device.  This patch introduces a new config
resource entry ("config_enableScreenshotChord"), true by default, so
that products on which this functionality is inapplicable can avoid
its runtime overhead.

Bug 6039047

Change-Id: I968ddf9046741da35988310b7893fae2c0369beb
parent d87a9be4

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -308,6 +308,9 @@ 
    <!-- If this is true, the screen will fade off. -->

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



    <!-- If this is true, key chords can be used to take a screenshot on the device. -->

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



    <!-- If true, the screen can be rotated via the accelerometer in all 4

         rotations as the default behavior. -->

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

core/res/res/values/public.xml

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

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

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

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



  <java-symbol type="integer" name="config_cursorWindowSize" />

  <java-symbol type="integer" name="config_longPressOnPowerBehavior" />

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

+7 −2
Original line number Diff line number Diff line
@@ -463,6 +463,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    // Screenshot trigger states

    // Time to volume and power must be pressed within this interval of each other.

    private static final long SCREENSHOT_CHORD_DEBOUNCE_DELAY_MILLIS = 150;

    private boolean mScreenshotChordEnabled;

    private boolean mVolumeDownKeyTriggered;

    private long mVolumeDownKeyTime;

    private boolean mVolumeDownKeyConsumedByScreenshotChord;
@@ -636,7 +637,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    }



    private void interceptScreenshotChord() {

        if (mVolumeDownKeyTriggered && mPowerKeyTriggered && !mVolumeUpKeyTriggered) {

        if (mScreenshotChordEnabled

                && mVolumeDownKeyTriggered && mPowerKeyTriggered && !mVolumeUpKeyTriggered) {

            final long now = SystemClock.uptimeMillis();

            if (now <= mVolumeDownKeyTime + SCREENSHOT_CHORD_DEBOUNCE_DELAY_MILLIS

                    && now <= mPowerKeyTime + SCREENSHOT_CHORD_DEBOUNCE_DELAY_MILLIS) {
@@ -882,6 +884,9 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        mSafeModeEnabledVibePattern = getLongIntArray(mContext.getResources(),

                com.android.internal.R.array.config_safeModeEnabledVibePattern);



        mScreenshotChordEnabled = mContext.getResources().getBoolean(

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



        // Controls rotation and the like.

        initializeHdmiState();
@@ -1574,7 +1579,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
        // If we think we might have a volume down & power key chord on the way

        // but we're not sure, then tell the dispatcher to wait a little while and

        // try again later before dispatching.

        if ((flags & KeyEvent.FLAG_FALLBACK) == 0) {

        if (mScreenshotChordEnabled && (flags & KeyEvent.FLAG_FALLBACK) == 0) {

            if (mVolumeDownKeyTriggered && !mPowerKeyTriggered) {

                final long now = SystemClock.uptimeMillis();

                final long timeoutTime = mVolumeDownKeyTime + SCREENSHOT_CHORD_DEBOUNCE_DELAY_MILLIS;