From 17dc10724bf0db04d0a4bfb2b8be0739ad9e60c6 Mon Sep 17 00:00:00 2001
From: "Tadashi G. Takaoka" <takaoka@google.com>
Date: Wed, 14 Dec 2011 15:20:52 +0900
Subject: [PATCH] Remove long press settings key function

Bug: 5759092
Change-Id: I328e2043075ce5d0d0285febc4a9b7356702c250
---
 .../keyboard/LatinKeyboardView.java           | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
index af5f808fd..e56f2ea84 100644
--- a/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
+++ b/java/src/com/android/inputmethod/keyboard/LatinKeyboardView.java
@@ -409,19 +409,16 @@ public class LatinKeyboardView extends KeyboardView implements PointerTracker.Ke
                 invokeReleaseKey(primaryCode);
                 return true;
             }
-        }
-        if (primaryCode == Keyboard.CODE_SETTINGS || primaryCode == Keyboard.CODE_SPACE) {
-            // Both long pressing settings key and space key invoke IME switcher dialog.
-            if (invokeCustomRequest(LatinIME.CODE_SHOW_INPUT_METHOD_PICKER)) {
-                tracker.onLongPressed();
-                invokeReleaseKey(primaryCode);
-                return true;
-            } else {
-                return openMoreKeysPanel(parentKey, tracker);
+            if (primaryCode == Keyboard.CODE_SPACE) {
+                // Long pressing the space key invokes IME switcher dialog.
+                if (invokeCustomRequest(LatinIME.CODE_SHOW_INPUT_METHOD_PICKER)) {
+                    tracker.onLongPressed();
+                    invokeReleaseKey(primaryCode);
+                    return true;
+                }
             }
-        } else {
-            return openMoreKeysPanel(parentKey, tracker);
         }
+        return openMoreKeysPanel(parentKey, tracker);
     }
 
     private boolean invokeCustomRequest(int code) {