Merge "Remove 'Allow custom buttons' checkbox (1/2)" into cm-10.2 (3ba869fc) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+4 −10

Original line number	Diff line number	Diff line
		@@ -3174,15 +3174,8 @@ public final class Settings {
		public static final String LOCKSCREEN_VIBRATE_ENABLED = "lockscreen.vibrate_enabled";

		/**
		* Show the pending notification counts as overlays on the status bar
		* Whether to enable custom rebindings of the actions performed on
		* certain key press events.
		* @hide
		*/
		public static final String HARDWARE_KEY_REBINDING = "hardware_key_rebinding";

		/**
		* Action to perform when the home key is long-pressed. (Default is 2)
		* Action to perform when the home key is long-pressed.
		* (Default can be configured via config_longPressOnHomeBehavior)
		* 0 - Nothing
		* 1 - Menu
		* 2 - App-switch
		@@ -3195,7 +3188,8 @@ public final class Settings {
		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 is 0)
		* 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
		*/

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

+12 −22

Original line number	Diff line number	Diff line
		@@ -671,9 +671,6 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		resolver.registerContentObserver(Settings.System.getUriFor(
		Settings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION), false, this,
		UserHandle.USER_ALL);
		resolver.registerContentObserver(Settings.System.getUriFor(
		Settings.System.HARDWARE_KEY_REBINDING), false, this,
		UserHandle.USER_ALL);

		updateSettings();
		}
		@@ -1213,10 +1210,9 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		final boolean hasHome = (mDeviceHardwareKeys & KEY_MASK_HOME) != 0;
		final boolean hasAssist = (mDeviceHardwareKeys & KEY_MASK_ASSIST) != 0;
		final boolean hasAppSwitch = (mDeviceHardwareKeys & KEY_MASK_APP_SWITCH) != 0;
		final boolean hasCamera = (mDeviceHardwareKeys & KEY_MASK_CAMERA) != 0;
		final ContentResolver resolver = mContext.getContentResolver();

		// initialize all assignments to sane defaults
		// Initialize all assignments to sane defaults.
		mPressOnMenuBehavior = KEY_ACTION_MENU;
		if (!hasMenu \|\| hasAssist) {
		mLongPressOnMenuBehavior = KEY_ACTION_NOTHING;
		@@ -1231,29 +1227,24 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		mLongPressOnHomeBehavior = mContext.getResources().getInteger(
		com.android.internal.R.integer.config_longPressOnHomeBehavior);
		if (mLongPressOnHomeBehavior < KEY_ACTION_NOTHING \|\|
		mLongPressOnHomeBehavior > KEY_ACTION_IN_APP_SEARCH) {
		mLongPressOnHomeBehavior > KEY_ACTION_LAUNCH_CAMERA) {
		mLongPressOnHomeBehavior = KEY_ACTION_NOTHING;
		}

		mDoubleTapOnHomeBehavior = mContext.getResources().getInteger(
		com.android.internal.R.integer.config_doubleTapOnHomeBehavior);
		if (mDoubleTapOnHomeBehavior < KEY_ACTION_NOTHING \|\|
		mDoubleTapOnHomeBehavior > KEY_ACTION_IN_APP_SEARCH) {
		mDoubleTapOnHomeBehavior > KEY_ACTION_LAUNCH_CAMERA) {
		mDoubleTapOnHomeBehavior = KEY_ACTION_NOTHING;
		}

		boolean keyRebindingEnabled = Settings.System.getIntForUser(resolver,
		Settings.System.HARDWARE_KEY_REBINDING, 0, UserHandle.USER_CURRENT) == 1;
		if (!keyRebindingEnabled) {
		mHasMenuKeyEnabled = hasMenu;
		return;
		}
		mHasMenuKeyEnabled = false;

		// 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,
		hasAppSwitch ? KEY_ACTION_NOTHING : KEY_ACTION_APP_SWITCH,
		UserHandle.USER_CURRENT);
		mLongPressOnHomeBehavior, UserHandle.USER_CURRENT);
		mDoubleTapOnHomeBehavior = Settings.System.getIntForUser(resolver,
		Settings.System.KEY_HOME_DOUBLE_TAP_ACTION,
		mDoubleTapOnHomeBehavior, UserHandle.USER_CURRENT);
		@@ -1263,31 +1254,30 @@ public class PhoneWindowManager implements WindowManagerPolicy {
		if (hasMenu) {
		mPressOnMenuBehavior = Settings.System.getIntForUser(resolver,
		Settings.System.KEY_MENU_ACTION,
		KEY_ACTION_MENU, UserHandle.USER_CURRENT);
		mPressOnMenuBehavior, UserHandle.USER_CURRENT);
		mLongPressOnMenuBehavior = Settings.System.getIntForUser(resolver,
		Settings.System.KEY_MENU_LONG_PRESS_ACTION,
		hasAssist ? KEY_ACTION_NOTHING : KEY_ACTION_SEARCH,
		UserHandle.USER_CURRENT);
		mLongPressOnMenuBehavior, UserHandle.USER_CURRENT);
		mHasMenuKeyEnabled \|= mPressOnMenuBehavior == KEY_ACTION_MENU
		\|\| mLongPressOnMenuBehavior == KEY_ACTION_MENU;
		}
		if (hasAssist) {
		mPressOnAssistBehavior = Settings.System.getIntForUser(resolver,
		Settings.System.KEY_ASSIST_ACTION,
		KEY_ACTION_SEARCH, UserHandle.USER_CURRENT);
		mPressOnAssistBehavior, UserHandle.USER_CURRENT);
		mLongPressOnAssistBehavior = Settings.System.getIntForUser(resolver,
		Settings.System.KEY_ASSIST_LONG_PRESS_ACTION,
		KEY_ACTION_VOICE_SEARCH, UserHandle.USER_CURRENT);
		mLongPressOnAssistBehavior, UserHandle.USER_CURRENT);
		mHasMenuKeyEnabled \|= mPressOnAssistBehavior == KEY_ACTION_MENU
		\|\| mLongPressOnAssistBehavior == KEY_ACTION_MENU;
		}
		if (hasAppSwitch) {
		mPressOnAppSwitchBehavior = Settings.System.getIntForUser(resolver,
		Settings.System.KEY_APP_SWITCH_ACTION,
		KEY_ACTION_APP_SWITCH, UserHandle.USER_CURRENT);
		mPressOnAppSwitchBehavior, UserHandle.USER_CURRENT);
		mLongPressOnAppSwitchBehavior = Settings.System.getIntForUser(resolver,
		Settings.System.KEY_APP_SWITCH_LONG_PRESS_ACTION,
		KEY_ACTION_NOTHING, UserHandle.USER_CURRENT);
		mLongPressOnAppSwitchBehavior, UserHandle.USER_CURRENT);
		mHasMenuKeyEnabled \|= mPressOnAppSwitchBehavior == KEY_ACTION_MENU
		\|\| mLongPressOnAppSwitchBehavior == KEY_ACTION_MENU;
		}