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

Commit c080ee6a authored by Adnan Begovic's avatar Adnan Begovic Committed by Steve Kondik
Browse files

fw: Utilize CMSettings for specific buttons settings.

Change-Id: Ie42d08a2a024634f9e0482e15d809c05ae16c681
parent a814c8ff
Loading
Loading
Loading
Loading
+74 −72
Original line number Original line Diff line number Diff line
@@ -170,6 +170,8 @@ import java.util.HashSet;
import java.util.List;
import java.util.List;
import java.lang.reflect.Constructor;
import java.lang.reflect.Constructor;


import cyanogenmod.providers.CMSettings;

/**
/**
 * WindowManagerPolicy implementation for the Android phone UI.  This
 * WindowManagerPolicy implementation for the Android phone UI.  This
 * introduces a new method suffix, Lp, for an internal lock of the
 * introduces a new method suffix, Lp, for an internal lock of the
@@ -915,29 +917,29 @@ public class PhoneWindowManager implements WindowManagerPolicy {
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(Settings.System.getUriFor(
                    Settings.System.POINTER_LOCATION), false, this,
                    Settings.System.POINTER_LOCATION), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.KEY_HOME_LONG_PRESS_ACTION), false, this,
                    CMSettings.System.KEY_HOME_LONG_PRESS_ACTION), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.KEY_HOME_DOUBLE_TAP_ACTION), false, this,
                    CMSettings.System.KEY_HOME_DOUBLE_TAP_ACTION), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.KEY_MENU_ACTION), false, this,
                    CMSettings.System.KEY_MENU_ACTION), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.KEY_MENU_LONG_PRESS_ACTION), false, this,
                    CMSettings.System.KEY_MENU_LONG_PRESS_ACTION), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.KEY_ASSIST_ACTION), false, this,
                    CMSettings.System.KEY_ASSIST_ACTION), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.KEY_ASSIST_LONG_PRESS_ACTION), false, this,
                    CMSettings.System.KEY_ASSIST_LONG_PRESS_ACTION), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.KEY_APP_SWITCH_ACTION), false, this,
                    CMSettings.System.KEY_APP_SWITCH_ACTION), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION), false, this,
                    CMSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.Secure.getUriFor(
            resolver.registerContentObserver(Settings.Secure.getUriFor(
                    Settings.Secure.DEFAULT_INPUT_METHOD), false, this,
                    Settings.Secure.DEFAULT_INPUT_METHOD), false, this,
@@ -952,34 +954,34 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                    Settings.System.VOLBTN_MUSIC_CONTROLS), false, this,
                    Settings.System.VOLBTN_MUSIC_CONTROLS), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(Settings.System.getUriFor(
                    Settings.System.BACK_WAKE_SCREEN), false, this,
                    CMSettings.System.BACK_WAKE_SCREEN), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.MENU_WAKE_SCREEN), false, this,
                    CMSettings.System.MENU_WAKE_SCREEN), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.ASSIST_WAKE_SCREEN), false, this,
                    CMSettings.System.ASSIST_WAKE_SCREEN), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.APP_SWITCH_WAKE_SCREEN), false, this,
                    CMSettings.System.APP_SWITCH_WAKE_SCREEN), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.CAMERA_WAKE_SCREEN), false, this,
                    CMSettings.System.CAMERA_WAKE_SCREEN), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.CAMERA_SLEEP_ON_RELEASE), false, this,
                    CMSettings.System.CAMERA_SLEEP_ON_RELEASE), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.CAMERA_LAUNCH), false, this,
                    CMSettings.System.CAMERA_LAUNCH), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.VOLUME_WAKE_SCREEN), false, this,
                    CMSettings.System.VOLUME_WAKE_SCREEN), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.HOME_WAKE_SCREEN), false, this,
                    CMSettings.System.HOME_WAKE_SCREEN), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            resolver.registerContentObserver(Settings.System.getUriFor(
            resolver.registerContentObserver(CMSettings.System.getUriFor(
                    Settings.System.VOLUME_WAKE_SCREEN), false, this,
                    CMSettings.System.VOLUME_WAKE_SCREEN), false, this,
                    UserHandle.USER_ALL);
                    UserHandle.USER_ALL);
            updateSettings();
            updateSettings();
        }
        }
@@ -2050,35 +2052,35 @@ public class PhoneWindowManager implements WindowManagerPolicy {


        // Check for custom assignments and whether KEY_ACTION_MENU is assigned.
        // Check for custom assignments and whether KEY_ACTION_MENU is assigned.
        if (hasHome) {
        if (hasHome) {
            mLongPressOnHomeBehavior = Settings.System.getIntForUser(resolver,
            mLongPressOnHomeBehavior = CMSettings.System.getIntForUser(resolver,
                    Settings.System.KEY_HOME_LONG_PRESS_ACTION,
                    CMSettings.System.KEY_HOME_LONG_PRESS_ACTION,
                    mLongPressOnHomeBehavior, UserHandle.USER_CURRENT);
                    mLongPressOnHomeBehavior, UserHandle.USER_CURRENT);
            mDoubleTapOnHomeBehavior = Settings.System.getIntForUser(resolver,
            mDoubleTapOnHomeBehavior = CMSettings.System.getIntForUser(resolver,
                    Settings.System.KEY_HOME_DOUBLE_TAP_ACTION,
                    CMSettings.System.KEY_HOME_DOUBLE_TAP_ACTION,
                    mDoubleTapOnHomeBehavior, UserHandle.USER_CURRENT);
                    mDoubleTapOnHomeBehavior, UserHandle.USER_CURRENT);
        }
        }
        if (hasMenu) {
        if (hasMenu) {
            mPressOnMenuBehavior = Settings.System.getIntForUser(resolver,
            mPressOnMenuBehavior = CMSettings.System.getIntForUser(resolver,
                    Settings.System.KEY_MENU_ACTION,
                    CMSettings.System.KEY_MENU_ACTION,
                    mPressOnMenuBehavior, UserHandle.USER_CURRENT);
                    mPressOnMenuBehavior, UserHandle.USER_CURRENT);
            mLongPressOnMenuBehavior = Settings.System.getIntForUser(resolver,
            mLongPressOnMenuBehavior = CMSettings.System.getIntForUser(resolver,
                    Settings.System.KEY_MENU_LONG_PRESS_ACTION,
                    CMSettings.System.KEY_MENU_LONG_PRESS_ACTION,
                    mLongPressOnMenuBehavior, UserHandle.USER_CURRENT);
                    mLongPressOnMenuBehavior, UserHandle.USER_CURRENT);
        }
        }
        if (hasAssist) {
        if (hasAssist) {
            mPressOnAssistBehavior = Settings.System.getIntForUser(resolver,
            mPressOnAssistBehavior = CMSettings.System.getIntForUser(resolver,
                    Settings.System.KEY_ASSIST_ACTION,
                    CMSettings.System.KEY_ASSIST_ACTION,
                    mPressOnAssistBehavior, UserHandle.USER_CURRENT);
                    mPressOnAssistBehavior, UserHandle.USER_CURRENT);
            mLongPressOnAssistBehavior = Settings.System.getIntForUser(resolver,
            mLongPressOnAssistBehavior = CMSettings.System.getIntForUser(resolver,
                    Settings.System.KEY_ASSIST_LONG_PRESS_ACTION,
                    CMSettings.System.KEY_ASSIST_LONG_PRESS_ACTION,
                    mLongPressOnAssistBehavior, UserHandle.USER_CURRENT);
                    mLongPressOnAssistBehavior, UserHandle.USER_CURRENT);
        }
        }
        if (hasAppSwitch) {
        if (hasAppSwitch) {
            mPressOnAppSwitchBehavior = Settings.System.getIntForUser(resolver,
            mPressOnAppSwitchBehavior = CMSettings.System.getIntForUser(resolver,
                    Settings.System.KEY_APP_SWITCH_ACTION,
                    CMSettings.System.KEY_APP_SWITCH_ACTION,
                    mPressOnAppSwitchBehavior, UserHandle.USER_CURRENT);
                    mPressOnAppSwitchBehavior, UserHandle.USER_CURRENT);
            mLongPressOnAppSwitchBehavior = Settings.System.getIntForUser(resolver,
            mLongPressOnAppSwitchBehavior = CMSettings.System.getIntForUser(resolver,
                    Settings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION,
                    CMSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION,
                    mLongPressOnAppSwitchBehavior, UserHandle.USER_CURRENT);
                    mLongPressOnAppSwitchBehavior, UserHandle.USER_CURRENT);
        }
        }


@@ -2208,34 +2210,34 @@ public class PhoneWindowManager implements WindowManagerPolicy {
                    Settings.System.END_BUTTON_BEHAVIOR,
                    Settings.System.END_BUTTON_BEHAVIOR,
                    Settings.System.END_BUTTON_BEHAVIOR_DEFAULT,
                    Settings.System.END_BUTTON_BEHAVIOR_DEFAULT,
                    UserHandle.USER_CURRENT);
                    UserHandle.USER_CURRENT);
            mIncallPowerBehavior = Settings.Secure.getIntForUser(resolver,
            mIncallPowerBehavior = CMSettings.Secure.getIntForUser(resolver,
                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
                    CMSettings.Secure.INCALL_POWER_BUTTON_BEHAVIOR,
                    Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT,
                    CMSettings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT,
                    UserHandle.USER_CURRENT);
                    UserHandle.USER_CURRENT);
            mHomeWakeScreen = (Settings.System.getIntForUser(resolver,
            mHomeWakeScreen = (CMSettings.System.getIntForUser(resolver,
                    Settings.System.HOME_WAKE_SCREEN, 1, UserHandle.USER_CURRENT) == 1) &&
                    CMSettings.System.HOME_WAKE_SCREEN, 1, UserHandle.USER_CURRENT) == 1) &&
                    ((mDeviceHardwareWakeKeys & KEY_MASK_HOME) != 0);
                    ((mDeviceHardwareWakeKeys & KEY_MASK_HOME) != 0);
            mBackWakeScreen = (Settings.System.getIntForUser(resolver,
            mBackWakeScreen = (CMSettings.System.getIntForUser(resolver,
                    Settings.System.BACK_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&
                    CMSettings.System.BACK_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&
                    ((mDeviceHardwareWakeKeys & KEY_MASK_BACK) != 0);
                    ((mDeviceHardwareWakeKeys & KEY_MASK_BACK) != 0);
            mMenuWakeScreen = (Settings.System.getIntForUser(resolver,
            mMenuWakeScreen = (CMSettings.System.getIntForUser(resolver,
                    Settings.System.MENU_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&
                    CMSettings.System.MENU_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&
                    ((mDeviceHardwareWakeKeys & KEY_MASK_MENU) != 0);
                    ((mDeviceHardwareWakeKeys & KEY_MASK_MENU) != 0);
            mAssistWakeScreen = (Settings.System.getIntForUser(resolver,
            mAssistWakeScreen = (CMSettings.System.getIntForUser(resolver,
                    Settings.System.ASSIST_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&
                    CMSettings.System.ASSIST_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&
                    ((mDeviceHardwareWakeKeys & KEY_MASK_ASSIST) != 0);
                    ((mDeviceHardwareWakeKeys & KEY_MASK_ASSIST) != 0);
            mAppSwitchWakeScreen = (Settings.System.getIntForUser(resolver,
            mAppSwitchWakeScreen = (CMSettings.System.getIntForUser(resolver,
                    Settings.System.APP_SWITCH_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&
                    CMSettings.System.APP_SWITCH_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&
                    ((mDeviceHardwareWakeKeys & KEY_MASK_APP_SWITCH) != 0);
                    ((mDeviceHardwareWakeKeys & KEY_MASK_APP_SWITCH) != 0);
            mCameraWakeScreen = (Settings.System.getIntForUser(resolver,
            mCameraWakeScreen = (CMSettings.System.getIntForUser(resolver,
                    Settings.System.CAMERA_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&
                    CMSettings.System.CAMERA_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&
                    ((mDeviceHardwareWakeKeys & KEY_MASK_CAMERA) != 0);
                    ((mDeviceHardwareWakeKeys & KEY_MASK_CAMERA) != 0);
            mCameraSleepOnRelease = (Settings.System.getIntForUser(resolver,
            mCameraSleepOnRelease = (CMSettings.System.getIntForUser(resolver,
                    Settings.System.CAMERA_SLEEP_ON_RELEASE, 0, UserHandle.USER_CURRENT) == 1);
                    CMSettings.System.CAMERA_SLEEP_ON_RELEASE, 0, UserHandle.USER_CURRENT) == 1);
            mCameraLaunch = (Settings.System.getIntForUser(resolver,
            mCameraLaunch = (CMSettings.System.getIntForUser(resolver,
                    Settings.System.CAMERA_LAUNCH, 0, UserHandle.USER_CURRENT) == 1);
                    CMSettings.System.CAMERA_LAUNCH, 0, UserHandle.USER_CURRENT) == 1);
            mVolumeWakeScreen = (Settings.System.getIntForUser(resolver,
            mVolumeWakeScreen = (CMSettings.System.getIntForUser(resolver,
                    Settings.System.VOLUME_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&
                    CMSettings.System.VOLUME_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) &&
                    ((mDeviceHardwareWakeKeys & KEY_MASK_VOLUME) != 0);
                    ((mDeviceHardwareWakeKeys & KEY_MASK_VOLUME) != 0);
            mVolBtnMusicControls = (Settings.System.getIntForUser(resolver,
            mVolBtnMusicControls = (Settings.System.getIntForUser(resolver,
                    Settings.System.VOLBTN_MUSIC_CONTROLS, 1, UserHandle.USER_CURRENT) == 1);
                    Settings.System.VOLBTN_MUSIC_CONTROLS, 1, UserHandle.USER_CURRENT) == 1);