diff options
| -rw-r--r-- | core/java/android/provider/Settings.java | 121 | ||||
| -rw-r--r-- | services/core/java/com/android/server/policy/PhoneWindowManager.java | 147 |
2 files changed, 74 insertions, 194 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index f3081ab..5b4b51c 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -3726,109 +3726,6 @@ public final class Settings { public static final String WIFI_AUTO_CONNECT_TYPE = "wifi_auto_connect_type"; /** - * Action to perform when the home key is long-pressed. - * (Default can be configured via config_longPressOnHomeBehavior) - * 0 - Nothing - * 1 - Menu - * 2 - App-switch - * 3 - Search - * 4 - Voice search - * 5 - In-app search - * 6 - Launch Camera - * 7 - Action Sleep - * 8 - Last app - * @hide - */ - public static final String KEY_HOME_LONG_PRESS_ACTION = "key_home_long_press_action"; - - /** - * Action to perform when the home key is double-tapped. - * (Default can be configured via config_doubleTapOnHomeBehavior) - * (See KEY_HOME_LONG_PRESS_ACTION for valid values) - * @hide - */ - public static final String KEY_HOME_DOUBLE_TAP_ACTION = "key_home_double_tap_action"; - - /** - * Action to perform when the menu key is pressed. (Default is 1) - * (See KEY_HOME_LONG_PRESS_ACTION for valid values) - * @hide - */ - public static final String KEY_MENU_ACTION = "key_menu_action"; - - /** - * Action to perform when the menu key is long-pressed. - * (Default is 0 on devices with a search key, 3 on devices without) - * (See KEY_HOME_LONG_PRESS_ACTION for valid values) - * @hide - */ - public static final String KEY_MENU_LONG_PRESS_ACTION = "key_menu_long_press_action"; - - /** - * Action to perform when the assistant (search) key is pressed. (Default is 3) - * (See KEY_HOME_LONG_PRESS_ACTION for valid values) - * @hide - */ - public static final String KEY_ASSIST_ACTION = "key_assist_action"; - - /** - * Action to perform when the assistant (search) key is long-pressed. (Default is 4) - * (See KEY_HOME_LONG_PRESS_ACTION for valid values) - * @hide - */ - public static final String KEY_ASSIST_LONG_PRESS_ACTION = "key_assist_long_press_action"; - - /** - * Action to perform when the app switch key is pressed. (Default is 2) - * (See KEY_HOME_LONG_PRESS_ACTION for valid values) - * @hide - */ - public static final String KEY_APP_SWITCH_ACTION = "key_app_switch_action"; - - /** - * Action to perform when the app switch key is long-pressed. (Default is 0) - * (See KEY_HOME_LONG_PRESS_ACTION for valid values) - * @hide - */ - public static final String KEY_APP_SWITCH_LONG_PRESS_ACTION = "key_app_switch_long_press_action"; - - /** - * Whether to wake the screen with the home key, the value is boolean. - * @hide - */ - public static final String HOME_WAKE_SCREEN = "home_wake_screen"; - - /** - * Whether to wake the screen with the assist key, the value is boolean. - * @hide - */ - public static final String ASSIST_WAKE_SCREEN = "assist_wake_screen"; - - /** - * Whether to wake the screen with the app switch key, the value is boolean. - * @hide - */ - public static final String APP_SWITCH_WAKE_SCREEN = "app_switch_wake_screen"; - - /** - * Whether to wake the screen with the camera key half-press. - * @hide - */ - public static final String CAMERA_WAKE_SCREEN = "camera_wake_screen"; - - /** - * Whether or not to send device back to sleep if Camera button is released ("Peek") - * @hide - */ - public static final String CAMERA_SLEEP_ON_RELEASE = "camera_sleep_on_release"; - - /** - * Whether to launch secure camera app when key is longpressed - * @hide - */ - public static final String CAMERA_LAUNCH = "camera_launch"; - - /** * Color temperature of the display during the day * @hide */ @@ -3918,24 +3815,6 @@ public final class Settings { public static final String VOICE_LAUNCH_INTENT = "voice_launch_intent"; /** - * Whether to wake the screen with the back key, the value is boolean. - * @hide - */ - public static final String BACK_WAKE_SCREEN = "back_wake_screen"; - - /** - * Whether to wake the screen with the menu key, the value is boolean. - * @hide - */ - public static final String MENU_WAKE_SCREEN = "menu_wake_screen"; - - /** - * Whether to wake the screen with the volume keys, the value is boolean. - * @hide - */ - public static final String VOLUME_WAKE_SCREEN = "volume_wake_screen"; - - /** * Whether navigation bar is placed on the left side in landscape mode * @hide */ diff --git a/services/core/java/com/android/server/policy/PhoneWindowManager.java b/services/core/java/com/android/server/policy/PhoneWindowManager.java index 1434a29..2f15dab 100644 --- a/services/core/java/com/android/server/policy/PhoneWindowManager.java +++ b/services/core/java/com/android/server/policy/PhoneWindowManager.java @@ -87,6 +87,7 @@ import android.service.gesture.EdgeGestureManager; import com.android.internal.os.DeviceKeyHandler; import com.android.internal.util.cm.ActionUtils; +import cyanogenmod.providers.CMSettings; import dalvik.system.DexClassLoader; import android.util.DisplayMetrics; import android.util.EventLog; @@ -840,29 +841,29 @@ public class PhoneWindowManager implements WindowManagerPolicy { resolver.registerContentObserver(Settings.System.getUriFor( Settings.System.POINTER_LOCATION), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.KEY_HOME_LONG_PRESS_ACTION), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.KEY_HOME_LONG_PRESS_ACTION), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.KEY_HOME_DOUBLE_TAP_ACTION), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.KEY_HOME_DOUBLE_TAP_ACTION), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.KEY_MENU_ACTION), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.KEY_MENU_ACTION), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.KEY_MENU_LONG_PRESS_ACTION), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.KEY_MENU_LONG_PRESS_ACTION), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.KEY_ASSIST_ACTION), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.KEY_ASSIST_ACTION), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.KEY_ASSIST_LONG_PRESS_ACTION), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.KEY_ASSIST_LONG_PRESS_ACTION), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.KEY_APP_SWITCH_ACTION), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.KEY_APP_SWITCH_ACTION), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION), false, this, UserHandle.USER_ALL); resolver.registerContentObserver(Settings.Secure.getUriFor( Settings.Secure.DEFAULT_INPUT_METHOD), false, this, @@ -888,35 +889,35 @@ public class PhoneWindowManager implements WindowManagerPolicy { resolver.registerContentObserver(Settings.System.getUriFor( Settings.System.USE_EDGE_SERVICE_FOR_GESTURES), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.BACK_WAKE_SCREEN), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.BACK_WAKE_SCREEN), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.MENU_WAKE_SCREEN), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.MENU_WAKE_SCREEN), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.ASSIST_WAKE_SCREEN), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.ASSIST_WAKE_SCREEN), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.APP_SWITCH_WAKE_SCREEN), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.APP_SWITCH_WAKE_SCREEN), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.CAMERA_WAKE_SCREEN), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.CAMERA_WAKE_SCREEN), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.CAMERA_SLEEP_ON_RELEASE), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.CAMERA_SLEEP_ON_RELEASE), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.CAMERA_LAUNCH), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.CAMERA_LAUNCH), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.VOLUME_WAKE_SCREEN), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.VOLUME_WAKE_SCREEN), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.HOME_WAKE_SCREEN), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.HOME_WAKE_SCREEN), false, this, UserHandle.USER_ALL); - resolver.registerContentObserver(Settings.System.getUriFor( - Settings.System.VOLUME_WAKE_SCREEN), false, this, + resolver.registerContentObserver(CMSettings.System.getUriFor( + CMSettings.System.VOLUME_WAKE_SCREEN), false, this, UserHandle.USER_ALL); resolver.registerContentObserver(Settings.System.getUriFor( Settings.System.NAVBAR_LEFT_IN_LANDSCAPE), false, this, @@ -1946,44 +1947,44 @@ public class PhoneWindowManager implements WindowManagerPolicy { // Check for custom assignments and whether KEY_ACTION_MENU is assigned. if (hasHome) { - mLongPressOnHomeBehavior = Settings.System.getIntForUser(resolver, - Settings.System.KEY_HOME_LONG_PRESS_ACTION, + mLongPressOnHomeBehavior = CMSettings.System.getIntForUser(resolver, + CMSettings.System.KEY_HOME_LONG_PRESS_ACTION, mLongPressOnHomeBehavior, UserHandle.USER_CURRENT); - mDoubleTapOnHomeBehavior = Settings.System.getIntForUser(resolver, - Settings.System.KEY_HOME_DOUBLE_TAP_ACTION, + mDoubleTapOnHomeBehavior = CMSettings.System.getIntForUser(resolver, + CMSettings.System.KEY_HOME_DOUBLE_TAP_ACTION, mDoubleTapOnHomeBehavior, UserHandle.USER_CURRENT); hasPermanentMenu = mLongPressOnHomeBehavior == KEY_ACTION_MENU || mDoubleTapOnHomeBehavior == KEY_ACTION_MENU; } if (hasMenu) { - mPressOnMenuBehavior = Settings.System.getIntForUser(resolver, - Settings.System.KEY_MENU_ACTION, + mPressOnMenuBehavior = CMSettings.System.getIntForUser(resolver, + CMSettings.System.KEY_MENU_ACTION, mPressOnMenuBehavior, UserHandle.USER_CURRENT); - mLongPressOnMenuBehavior = Settings.System.getIntForUser(resolver, - Settings.System.KEY_MENU_LONG_PRESS_ACTION, + mLongPressOnMenuBehavior = CMSettings.System.getIntForUser(resolver, + CMSettings.System.KEY_MENU_LONG_PRESS_ACTION, mLongPressOnMenuBehavior, UserHandle.USER_CURRENT); hasPermanentMenu |= mPressOnMenuBehavior == KEY_ACTION_MENU || mLongPressOnMenuBehavior == KEY_ACTION_MENU; } if (hasAssist) { - mPressOnAssistBehavior = Settings.System.getIntForUser(resolver, - Settings.System.KEY_ASSIST_ACTION, + mPressOnAssistBehavior = CMSettings.System.getIntForUser(resolver, + CMSettings.System.KEY_ASSIST_ACTION, mPressOnAssistBehavior, UserHandle.USER_CURRENT); - mLongPressOnAssistBehavior = Settings.System.getIntForUser(resolver, - Settings.System.KEY_ASSIST_LONG_PRESS_ACTION, + mLongPressOnAssistBehavior = CMSettings.System.getIntForUser(resolver, + CMSettings.System.KEY_ASSIST_LONG_PRESS_ACTION, mLongPressOnAssistBehavior, UserHandle.USER_CURRENT); hasPermanentMenu |= mPressOnAssistBehavior == KEY_ACTION_MENU || mLongPressOnAssistBehavior == KEY_ACTION_MENU; } if (hasAppSwitch) { - mPressOnAppSwitchBehavior = Settings.System.getIntForUser(resolver, - Settings.System.KEY_APP_SWITCH_ACTION, + mPressOnAppSwitchBehavior = CMSettings.System.getIntForUser(resolver, + CMSettings.System.KEY_APP_SWITCH_ACTION, mPressOnAppSwitchBehavior, UserHandle.USER_CURRENT); - mLongPressOnAppSwitchBehavior = Settings.System.getIntForUser(resolver, - Settings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, + mLongPressOnAppSwitchBehavior = CMSettings.System.getIntForUser(resolver, + CMSettings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION, mLongPressOnAppSwitchBehavior, UserHandle.USER_CURRENT); hasPermanentMenu |= mPressOnAppSwitchBehavior == KEY_ACTION_MENU @@ -2128,34 +2129,34 @@ public class PhoneWindowManager implements WindowManagerPolicy { Settings.System.END_BUTTON_BEHAVIOR, Settings.System.END_BUTTON_BEHAVIOR_DEFAULT, UserHandle.USER_CURRENT); - mIncallPowerBehavior = Settings.Secure.getIntForUser(resolver, - Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, - Settings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT, + mIncallPowerBehavior = CMSettings.Secure.getIntForUser(resolver, + CMSettings.Secure.INCALL_POWER_BUTTON_BEHAVIOR, + CMSettings.Secure.INCALL_POWER_BUTTON_BEHAVIOR_DEFAULT, UserHandle.USER_CURRENT); - mHomeWakeScreen = (Settings.System.getIntForUser(resolver, - Settings.System.HOME_WAKE_SCREEN, 1, UserHandle.USER_CURRENT) == 1) && + mHomeWakeScreen = (CMSettings.System.getIntForUser(resolver, + CMSettings.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) && + mBackWakeScreen = (CMSettings.System.getIntForUser(resolver, + CMSettings.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) && + mMenuWakeScreen = (CMSettings.System.getIntForUser(resolver, + CMSettings.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) && + mAssistWakeScreen = (CMSettings.System.getIntForUser(resolver, + CMSettings.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) && + mAppSwitchWakeScreen = (CMSettings.System.getIntForUser(resolver, + CMSettings.System.APP_SWITCH_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) && ((mDeviceHardwareWakeKeys & KEY_MASK_APP_SWITCH) != 0); - mCameraWakeScreen = (Settings.System.getIntForUser(resolver, - Settings.System.CAMERA_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) && + mCameraWakeScreen = (CMSettings.System.getIntForUser(resolver, + CMSettings.System.CAMERA_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) && ((mDeviceHardwareWakeKeys & KEY_MASK_CAMERA) != 0); - mCameraSleepOnRelease = (Settings.System.getIntForUser(resolver, - Settings.System.CAMERA_SLEEP_ON_RELEASE, 0, UserHandle.USER_CURRENT) == 1); - mCameraLaunch = (Settings.System.getIntForUser(resolver, - Settings.System.CAMERA_LAUNCH, 0, UserHandle.USER_CURRENT) == 1); - mVolumeWakeScreen = (Settings.System.getIntForUser(resolver, - Settings.System.VOLUME_WAKE_SCREEN, 0, UserHandle.USER_CURRENT) == 1) && + mCameraSleepOnRelease = (CMSettings.System.getIntForUser(resolver, + CMSettings.System.CAMERA_SLEEP_ON_RELEASE, 0, UserHandle.USER_CURRENT) == 1); + mCameraLaunch = (CMSettings.System.getIntForUser(resolver, + CMSettings.System.CAMERA_LAUNCH, 0, UserHandle.USER_CURRENT) == 1); + mVolumeWakeScreen = (CMSettings.System.getIntForUser(resolver, + CMSettings.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); |