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

Commit 1814ad52 authored by Michael Bestas's avatar Michael Bestas Committed by Steve Kondik
Browse files

Cleanup button wake settings (2/2) 

Change-Id: Ie37136cbd57c4c334321abbfa4543727e940bc43

Keep quiet when volume keys are used to wake up device

- Userspace will make a 'beep' with it receives a key up, so
  consume that event as well.
- Removed wake key check in music control code as it will already
  be disabled here.

Change-Id: I93839acd39aec8a2ee40291f833a31f6b048c9f8

Wake Keys: enforce the wake keys overlay

* Keys disabled as wake keys by the overlay were
  still being allowed to wake the device. This change
  enforces the hardwareWakeKeys settings.

Change-Id: Ifde0491b2de64a7f61a101cf22f5589cb5e841e2

Allow disabling Search/Recents button wake (2/2)

Change-Id: I6a2ac064efc4fe85413bf0b935c28aa7bde5d672
parent f8dc549e

core/res/res/values/config.xml

+17 −2
Original line number Diff line number Diff line
@@ -1026,7 +1026,7 @@ 
    -->

    <integer name="config_longPressOnMenuBehavior">3</integer>



    <!-- Hardware 'face' keys present on the device, stored as a bit field.

    <!-- Hardware keys present on the device, stored as a bit field.

         This integer should equal the sum of the corresponding value for each

         of the following keys present:

             1 - Home
@@ -1035,9 +1035,24 @@ 
             8 - Assistant (search)

            16 - App switch

            32 - Camera

            64 - Volume rocker

         For example, a device with Home, Back and Menu keys would set this

         config to 7. -->

    <integer name="config_deviceHardwareKeys">15</integer>

    <integer name="config_deviceHardwareKeys">79</integer>



    <!-- Hardware keys present on the device with the ability to wake, stored as a bit field.

         This integer should equal the sum of the corresponding value for each

         of the following keys present:

             1 - Home

             2 - Back

             4 - Menu

             8 - Assistant (search)

            16 - App switch

            32 - Camera

            64 - Volume rocker

         For example, a device with Home, Back and Menu keys would set this

         config to 7. -->

    <integer name="config_deviceHardwareWakeKeys">79</integer>



    <!-- Minimum screen brightness setting allowed by the power manager.

         The user is forbidden from setting the brightness below this level. -->

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1556,6 +1556,7 @@ 
  <java-symbol type="integer" name="config_defaultUiModeType" />

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

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

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

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

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

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

services/core/java/com/android/server/policy/PhoneWindowManager.java

+68 −4
Original line number Diff line number Diff line
@@ -266,6 +266,7 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    private static final int KEY_MASK_ASSIST = 0x08;

    private static final int KEY_MASK_APP_SWITCH = 0x10;

    private static final int KEY_MASK_CAMERA = 0x20;

    private static final int KEY_MASK_VOLUME = 0x40;





    /**
@@ -505,10 +506,20 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    boolean mUseTvRouting;

    int mBackKillTimeout;



    // Behavior of home wake

    int mDeviceHardwareKeys;



    // Button wake control flags

    boolean mHomeWakeScreen;

    boolean mBackWakeScreen;

    boolean mMenuWakeScreen;

    boolean mAssistWakeScreen;

    boolean mAppSwitchWakeScreen;

    boolean mVolumeWakeScreen;



    int mDeviceHardwareKeys;

    // During wakeup by volume keys, we still need to capture subsequent events

    // until the key is released. This is required since the beep sound is produced

    // post keypressed.

    boolean mVolumeWakeTriggered;



    int mPointerLocationMode = 0; // guarded by mLock
@@ -925,6 +936,21 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.VOLBTN_MUSIC_CONTROLS), false, this,

                    UserHandle.USER_ALL);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.BACK_WAKE_SCREEN), false, this,

                    UserHandle.USER_ALL);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.MENU_WAKE_SCREEN), false, this,

                    UserHandle.USER_ALL);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.ASSIST_WAKE_SCREEN), false, this,

                    UserHandle.USER_ALL);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.APP_SWITCH_WAKE_SCREEN), false, this,

                    UserHandle.USER_ALL);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.VOLUME_WAKE_SCREEN), false, this,

                    UserHandle.USER_ALL);

            resolver.registerContentObserver(Settings.System.getUriFor(

                    Settings.System.HOME_WAKE_SCREEN), false, this,

                    UserHandle.USER_ALL);
@@ -2148,6 +2174,8 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
    public void updateSettings() {

        ContentResolver resolver = mContext.getContentResolver();

        boolean updateRotation = false;

        int mDeviceHardwareWakeKeys = mContext.getResources().getInteger(

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

        synchronized (mLock) {

            mEndcallBehavior = Settings.System.getIntForUser(resolver,

                    Settings.System.END_BUTTON_BEHAVIOR,
@@ -2157,10 +2185,26 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,

                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT,

                    UserHandle.USER_CURRENT);

            mHomeWakeScreen = (Settings.System.getIntForUser(resolver,

                    Settings.System.HOME_WAKE_SCREEN, 1, UserHandle.USER_CURRENT) == 1) &&

                    ((mDeviceHardwareWakeKeys & KEY_MASK_HOME) != 0);

            mBackWakeScreen = (Settings.System.getIntForUser(resolver,

                    Settings.System.BACK_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&

                    ((mDeviceHardwareWakeKeys & KEY_MASK_BACK) != 0);

            mMenuWakeScreen = (Settings.System.getIntForUser(resolver,

                    Settings.System.MENU_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&

                    ((mDeviceHardwareWakeKeys & KEY_MASK_MENU) != 0);

            mAssistWakeScreen = (Settings.System.getIntForUser(resolver,

                    Settings.System.ASSIST_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&

                    ((mDeviceHardwareWakeKeys & KEY_MASK_ASSIST) != 0);

            mAppSwitchWakeScreen = (Settings.System.getIntForUser(resolver,

                    Settings.System.APP_SWITCH_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&

                    ((mDeviceHardwareWakeKeys & KEY_MASK_APP_SWITCH) != 0);

            mVolumeWakeScreen = (Settings.System.getIntForUser(resolver,

                    Settings.System.VOLUME_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&

                    ((mDeviceHardwareWakeKeys & KEY_MASK_VOLUME) != 0);

            mVolBtnMusicControls = (Settings.System.getIntForUser(resolver,

                    Settings.System.VOLBTN_MUSIC_CONTROLS, 1, UserHandle.USER_CURRENT) == 1);

            mHomeWakeScreen = (Settings.System.getIntForUser(resolver,

                    Settings.System.HOME_WAKE_SCREEN, 1, UserHandle.USER_CURRENT) == 1);



            // Configure wake gesture.

            boolean wakeGestureEnabledSetting = Settings.Secure.getIntForUser(resolver,
@@ -5904,6 +5948,17 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            case KeyEvent.KEYCODE_VOLUME_DOWN:

            case KeyEvent.KEYCODE_VOLUME_UP:

            case KeyEvent.KEYCODE_VOLUME_MUTE: {

                // Eat all down & up keys when using volume wake.

                // This disables volume control, music control, and "beep" on key up.

                if (isWakeKey && mVolumeWakeScreen) {

                    mVolumeWakeTriggered = true;

                    break;

                } else if (mVolumeWakeTriggered && !down) {

                    result &= ~ACTION_PASS_TO_USER;

                    mVolumeWakeTriggered = false;

                    break;

                }



                if (keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {

                    if (down) {

                        if (interactive && !mScreenshotChordVolumeDownKeyTriggered
@@ -6255,6 +6310,15 @@ public class PhoneWindowManager implements WindowManagerPolicy { 
            case KeyEvent.KEYCODE_MEDIA_AUDIO_TRACK:

            case KeyEvent.KEYCODE_CAMERA:

                return false;



            case KeyEvent.KEYCODE_BACK:

                return mBackWakeScreen;

            case KeyEvent.KEYCODE_MENU:

                return mMenuWakeScreen;

            case KeyEvent.KEYCODE_ASSIST:

                return mAssistWakeScreen;

            case KeyEvent.KEYCODE_APP_SWITCH:

                return mAppSwitchWakeScreen;

        }

        return true;

    }