From 5962312b0724d8546ef76e3cd065b7baf578822f Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 8 Feb 2012 20:09:39 +0900
Subject: Custom action label should be a part of keyboard identifier

Change-Id: Ia14cabc3d49fbdcb11dd00225d225fbb91cc4012
---
 java/src/com/android/inputmethod/keyboard/KeyboardId.java | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'java/src')

diff --git a/java/src/com/android/inputmethod/keyboard/KeyboardId.java b/java/src/com/android/inputmethod/keyboard/KeyboardId.java
index a000eae62..3ab24933c 100644
--- a/java/src/com/android/inputmethod/keyboard/KeyboardId.java
+++ b/java/src/com/android/inputmethod/keyboard/KeyboardId.java
@@ -102,6 +102,7 @@ public class KeyboardId {
                 id.mHasShortcutKey,
                 id.isMultiLine(),
                 id.imeAction(),
+                id.mCustomActionLabel,
                 id.mLocale
         });
     }
@@ -121,6 +122,7 @@ public class KeyboardId {
                 && other.mHasShortcutKey == this.mHasShortcutKey
                 && other.isMultiLine() == this.isMultiLine()
                 && other.imeAction() == this.imeAction()
+                && TextUtils.equals(other.mCustomActionLabel, this.mCustomActionLabel)
                 && other.mLocale.equals(this.mLocale);
     }
 
-- 
cgit v1.2.3-83-g751a