From 2ba975afb9529a6574148596db190b939fbc3b3f Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Sat, 30 Jul 2011 10:19:51 +0900
Subject: Turn off the Settings key by default

bug:5094401
Change-Id: Ieb42fdfa79be2afcfa6634e7404c17737ef6927d
---
 java/src/com/android/inputmethod/latin/Utils.java | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'java/src/com/android/inputmethod/latin/Utils.java')

diff --git a/java/src/com/android/inputmethod/latin/Utils.java b/java/src/com/android/inputmethod/latin/Utils.java
index 6bdc0a857..23ef1a03c 100644
--- a/java/src/com/android/inputmethod/latin/Utils.java
+++ b/java/src/com/android/inputmethod/latin/Utils.java
@@ -546,11 +546,11 @@ public class Utils {
         }
     }
 
-    public static int getKeyboardMode(EditorInfo attribute) {
-        if (attribute == null)
+    public static int getKeyboardMode(EditorInfo editorInfo) {
+        if (editorInfo == null)
             return KeyboardId.MODE_TEXT;
 
-        final int inputType = attribute.inputType;
+        final int inputType = editorInfo.inputType;
         final int variation = inputType & InputType.TYPE_MASK_VARIATION;
 
         switch (inputType & InputType.TYPE_MASK_CLASS) {
@@ -587,11 +587,11 @@ public class Utils {
     }
 
     public static boolean inPrivateImeOptions(String packageName, String key,
-            EditorInfo attribute) {
-        if (attribute == null)
+            EditorInfo editorInfo) {
+        if (editorInfo == null)
             return false;
         return containsInCsv(packageName != null ? packageName + "." + key : key,
-                attribute.privateImeOptions);
+                editorInfo.privateImeOptions);
     }
 
     /**
-- 
cgit v1.2.3-83-g751a