From 2863997abd6e27b6b8ab06efe1f58d5ba3b4a908 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Mon, 11 Aug 2014 15:10:47 +0900
Subject: [PATCH] Fix Kannada keyboard

Bug: 10029252
Change-Id: I5ae056ca6ada4ffb921e9882bf57ad21a9bb4d47
---
 java/res/xml/rowkeys_kannada3.xml                        | 9 ++++-----
 .../com/android/inputmethod/keyboard/layout/Kannada.java | 7 ++++---
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/java/res/xml/rowkeys_kannada3.xml b/java/res/xml/rowkeys_kannada3.xml
index 0f1aecbac..03fa05551 100644
--- a/java/res/xml/rowkeys_kannada3.xml
+++ b/java/res/xml/rowkeys_kannada3.xml
@@ -29,13 +29,12 @@
     <Key
         latin:keySpec="&#x0C82;"
         latin:moreKeys="&#x0C8E;" />
-    <!-- U+0CAE: "ಮ" KANNADA LETTER MA
+    <!-- U+0CAE: "ಮ" KANNADA LETTER MA -->
+    <Key latin:keySpec="&#x0CAE;" />
+    <!-- U+0CA8: "ನ" KANNADA LETTER NA
          U+0CA3: "ಣ" KANNADA LETTER NNA -->
-    <Key
-        latin:keySpec="&#x0CAE;"
+    <Key latin:keySpec="&#x0CA8;"
         latin:moreKeys="&#x0CA3;" />
-    <!-- U+0CA8: "ನ" KANNADA LETTER NA -->
-    <Key latin:keySpec="&#x0CA8;" />
     <!-- U+0CB5: "ವ" KANNADA LETTER VA -->
     <Key latin:keySpec="&#x0CB5;" />
     <!-- U+0CB2: "ಲ" KANNADA LETTER LA
diff --git a/tests/src/com/android/inputmethod/keyboard/layout/Kannada.java b/tests/src/com/android/inputmethod/keyboard/layout/Kannada.java
index 5ce7f4d9c..8bee1f83b 100644
--- a/tests/src/com/android/inputmethod/keyboard/layout/Kannada.java
+++ b/tests/src/com/android/inputmethod/keyboard/layout/Kannada.java
@@ -171,11 +171,12 @@ public final class Kannada extends LayoutBase {
                     // U+0C8E: "ಎ" KANNADA LETTER E
                     key("\u0C82", moreKey("\u0C8E")),
                     // U+0CAE: "ಮ" KANNADA LETTER MA
-                    // U+0CA3: "ಣ" KANNADA LETTER NNA
-                    key("\u0CAE", moreKey("\u0CA3")),
+                    "\u0CAE",
                     // U+0CA8: "ನ" KANNADA LETTER NA
+                    // U+0CA3: "ಣ" KANNADA LETTER NNA
+                    key("\u0CA8", moreKey("\u0CA3")),
                     // U+0CB5: "ವ" KANNADA LETTER VA
-                    "\u0CA8", "\u0CB5",
+                    "\u0CB5",
                     // U+0CB2: "ಲ" KANNADA LETTER LA
                     // U+0CB3: "ಳ" KANNADA LETTER LLA
                     key("\u0CB2", moreKey("\u0CB3")),