commit 00e592272ee44cba41832e3cf0a0ffb2de56585d
author Michael Wright <michaelwr@google.com> Fri Feb 15 01:46:35 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 15 01:47:38 2013 +0000
tree de50bae70dcd287832c1022cd769af8fba1e48d0
parent 101ae3bb3909827303121e5e11ed16b7efe36538
parent 0648d2c4ce2ca4709382cc5e8bf78d07843b7373

Merge "Fix default behavior for gamepad buttons"

data/keyboards/Generic.kcm

diff --git a/data/keyboards/Generic.kcm b/data/keyboards/Generic.kcm
index 782a701..01d22ee 100644
--- a/data/keyboards/Generic.kcm
+++ b/data/keyboards/Generic.kcm
@@ -480,7 +480,7 @@
 ### Gamepad buttons ###
 
 key BUTTON_A {
-    base:                               fallback BACK
+    base:                               fallback DPAD_CENTER
 }
 
 key BUTTON_B {
@@ -488,7 +488,7 @@
 }
 
 key BUTTON_C {
-    base:                               fallback BACK
+    base:                               fallback DPAD_CENTER
 }
 
 key BUTTON_X {
@@ -496,7 +496,7 @@
 }
 
 key BUTTON_Y {
-    base:                               fallback DPAD_CENTER
+    base:                               fallback BACK
 }
 
 key BUTTON_Z {
@@ -528,7 +528,7 @@
 }
 
 key BUTTON_START {
-    base:                               fallback HOME
+    base:                               fallback DPAD_CENTER
 }
 
 key BUTTON_SELECT {

data/keyboards/Virtual.kcm

diff --git a/data/keyboards/Virtual.kcm b/data/keyboards/Virtual.kcm
index d90b790..c4647e0 100644
--- a/data/keyboards/Virtual.kcm
+++ b/data/keyboards/Virtual.kcm
@@ -477,7 +477,7 @@
 ### Gamepad buttons ###
 
 key BUTTON_A {
-    base:                               fallback BACK
+    base:                               fallback DPAD_CENTER
 }
 
 key BUTTON_B {
@@ -485,7 +485,7 @@
 }
 
 key BUTTON_C {
-    base:                               fallback BACK
+    base:                               fallback DPAD_CENTER
 }
 
 key BUTTON_X {
@@ -493,7 +493,7 @@
 }
 
 key BUTTON_Y {
-    base:                               fallback DPAD_CENTER
+    base:                               fallback BACK
 }
 
 key BUTTON_Z {
@@ -525,7 +525,7 @@
 }
 
 key BUTTON_START {
-    base:                               fallback HOME
+    base:                               fallback DPAD_CENTER
 }
 
 key BUTTON_SELECT {