Merge "Remove Japanese button swap" (d35ceee7) · Commits · e / os / android_frameworks_base

core/java/android/view/ViewRootImpl.java

+15 −100

Original line number	Diff line number	Diff line
		@@ -232,8 +232,6 @@ public final class ViewRootImpl implements ViewParent,
		InputStage mFirstInputStage;
		InputStage mFirstPostImeInputStage;

		boolean mFlipControllerFallbackKeys;

		boolean mWindowAttributesChanged = false;
		int mWindowAttributesChangesFlag = 0;

		@@ -370,8 +368,6 @@ public final class ViewRootImpl implements ViewParent,
		mNoncompatDensity = context.getResources().getDisplayMetrics().noncompatDensityDpi;
		mFallbackEventHandler = PolicyManager.makeNewFallbackEventHandler(context);
		mChoreographer = Choreographer.getInstance();
		mFlipControllerFallbackKeys =
		context.getResources().getBoolean(R.bool.flip_controller_fallback_keys);

		PowerManager powerManager = (PowerManager) context.getSystemService(Context.POWER_SERVICE);
		mAttachInfo.mScreenOn = powerManager.isScreenOn();
		@@ -2930,9 +2926,6 @@ public final class ViewRootImpl implements ViewParent,
		mView.dispatchConfigurationChanged(config);
		}
		}

		mFlipControllerFallbackKeys =
		mContext.getResources().getBoolean(R.bool.flip_controller_fallback_keys);
		}

		/**
		@@ -4001,7 +3994,6 @@ public final class ViewRootImpl implements ViewParent,
		private final SyntheticJoystickHandler mJoystick = new SyntheticJoystickHandler();
		private final SyntheticTouchNavigationHandler mTouchNavigation =
		new SyntheticTouchNavigationHandler();
		private final SyntheticKeyHandler mKeys = new SyntheticKeyHandler();

		public SyntheticInputStage() {
		super(null);
		@@ -4024,12 +4016,7 @@ public final class ViewRootImpl implements ViewParent,
		mTouchNavigation.process(event);
		return FINISH_HANDLED;
		}
		} else if (q.mEvent instanceof KeyEvent) {
		if (mKeys.process((KeyEvent) q.mEvent)) {
		return FINISH_HANDLED;
		}
		}

		return FORWARD;
		}

		@@ -4854,71 +4841,6 @@ public final class ViewRootImpl implements ViewParent,
		};
		}

		private KeyEvent getSyntheticFallbackKey(KeyEvent event) {
		// In some locales (like Japan) controllers use B for confirm and A for back, rather
		// than vice versa, so we need to special case this here since the input system itself
		// is not locale-aware.
		int keyCode;
		switch(event.getKeyCode()) {
		case KeyEvent.KEYCODE_BUTTON_A:
		case KeyEvent.KEYCODE_BUTTON_C:
		case KeyEvent.KEYCODE_BUTTON_X:
		case KeyEvent.KEYCODE_BUTTON_Z:
		keyCode = mFlipControllerFallbackKeys ?
		KeyEvent.KEYCODE_BACK : KeyEvent.KEYCODE_DPAD_CENTER;
		break;
		case KeyEvent.KEYCODE_BUTTON_B:
		case KeyEvent.KEYCODE_BUTTON_Y:
		keyCode = mFlipControllerFallbackKeys ?
		KeyEvent.KEYCODE_DPAD_CENTER : KeyEvent.KEYCODE_BACK;
		break;
		case KeyEvent.KEYCODE_BUTTON_THUMBL:
		case KeyEvent.KEYCODE_BUTTON_THUMBR:
		case KeyEvent.KEYCODE_BUTTON_START:
		case KeyEvent.KEYCODE_BUTTON_1:
		case KeyEvent.KEYCODE_BUTTON_2:
		case KeyEvent.KEYCODE_BUTTON_3:
		case KeyEvent.KEYCODE_BUTTON_4:
		case KeyEvent.KEYCODE_BUTTON_5:
		case KeyEvent.KEYCODE_BUTTON_6:
		case KeyEvent.KEYCODE_BUTTON_7:
		case KeyEvent.KEYCODE_BUTTON_8:
		case KeyEvent.KEYCODE_BUTTON_9:
		case KeyEvent.KEYCODE_BUTTON_10:
		case KeyEvent.KEYCODE_BUTTON_11:
		case KeyEvent.KEYCODE_BUTTON_12:
		case KeyEvent.KEYCODE_BUTTON_13:
		case KeyEvent.KEYCODE_BUTTON_14:
		case KeyEvent.KEYCODE_BUTTON_15:
		case KeyEvent.KEYCODE_BUTTON_16:
		keyCode = KeyEvent.KEYCODE_DPAD_CENTER;
		break;
		case KeyEvent.KEYCODE_BUTTON_SELECT:
		case KeyEvent.KEYCODE_BUTTON_MODE:
		keyCode = KeyEvent.KEYCODE_MENU;
		default:
		return null;
		}
		return KeyEvent.obtain(event.getDownTime(), event.getEventTime(),
		event.getAction(), keyCode, event.getRepeatCount(), event.getMetaState(),
		event.getDeviceId(), event.getScanCode(),
		event.getFlags() \| KeyEvent.FLAG_FALLBACK, event.getSource(), null);
		}


		final class SyntheticKeyHandler {

		public boolean process(KeyEvent event) {
		KeyEvent syntheticKey = getSyntheticFallbackKey(event);
		if (syntheticKey != null) {
		enqueueInputEvent(syntheticKey);
		return true;
		}
		return false;
		}

		}

		/**
		* Returns true if the key is used for keyboard navigation.
		* @param keyEvent The key event.
		@@ -5857,9 +5779,6 @@ public final class ViewRootImpl implements ViewParent,
		// Some fallback keys are decided by the ViewRoot as they might have special
		// properties (e.g. are locale aware). These take precedence over fallbacks defined by
		// the kcm.
		KeyEvent fallbackEvent = getSyntheticFallbackKey(event);

		if (fallbackEvent == null) {
		final KeyCharacterMap kcm = event.getKeyCharacterMap();
		final int keyCode = event.getKeyCode();
		final int metaState = event.getMetaState();
		@@ -5869,17 +5788,13 @@ public final class ViewRootImpl implements ViewParent,
		kcm.getFallbackAction(keyCode, metaState);
		if (fallbackAction != null) {
		final int flags = event.getFlags() \| KeyEvent.FLAG_FALLBACK;
		fallbackEvent = KeyEvent.obtain(
		KeyEvent fallbackEvent = KeyEvent.obtain(
		event.getDownTime(), event.getEventTime(),
		event.getAction(), fallbackAction.keyCode,
		event.getRepeatCount(), fallbackAction.metaState,
		event.getDeviceId(), event.getScanCode(),
		flags, event.getSource(), null);
		fallbackAction.recycle();

		}
		}
		if (fallbackEvent != null) {
		dispatchInputEvent(fallbackEvent);
		}
		}

core/res/res/values-ja/bools.xml

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!-- Copyright (C) 2013 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->

		<resources>
		<bool name="flip_controller_fallback_keys">true</bool>
		</resources>

core/res/res/values/bools.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,5 +26,4 @@
		<bool name="show_ongoing_ime_switcher">true</bool>
		<bool name="action_bar_expanded_action_views_exclusive">true</bool>
		<bool name="target_honeycomb_needs_options_menu">true</bool>
		<bool name="flip_controller_fallback_keys">false</bool>
		</resources>

core/res/res/values/symbols.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -289,7 +289,6 @@
		<java-symbol type="bool" name="config_useFixedVolume" />
		<java-symbol type="bool" name="config_forceDefaultOrientation" />
		<java-symbol type="bool" name="config_wifi_batched_scan_supported" />
		<java-symbol type="bool" name="flip_controller_fallback_keys" />

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

data/keyboards/Generic.kcm

+125 −1

Original line number	Diff line number	Diff line
		@@ -477,4 +477,128 @@ key ESCAPE {
		ctrl: fallback MENU
		}

		### Gamepad buttons are handled by the view root ###
		### Gamepad buttons ###

		key BUTTON_A {
		base: fallback DPAD_CENTER
		}

		key BUTTON_B {
		base: fallback BACK
		}

		key BUTTON_C {
		base: fallback DPAD_CENTER
		}

		key BUTTON_X {
		base: fallback DPAD_CENTER
		}

		key BUTTON_Y {
		base: fallback BACK
		}

		key BUTTON_Z {
		base: fallback DPAD_CENTER
		}

		key BUTTON_L1 {
		base: none
		}

		key BUTTON_R1 {
		base: none
		}

		key BUTTON_L2 {
		base: none
		}

		key BUTTON_R2 {
		base: none
		}

		key BUTTON_THUMBL {
		base: fallback DPAD_CENTER
		}

		key BUTTON_THUMBR {
		base: fallback DPAD_CENTER
		}

		key BUTTON_START {
		base: fallback DPAD_CENTER
		}

		key BUTTON_SELECT {
		base: fallback MENU
		}

		key BUTTON_MODE {
		base: fallback MENU
		}

		key BUTTON_1 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_2 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_3 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_4 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_5 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_6 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_7 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_8 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_9 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_10 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_11 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_12 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_13 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_14 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_15 {
		base: fallback DPAD_CENTER
		}

		key BUTTON_16 {
		base: fallback DPAD_CENTER
		}