From 125de3dfdf548359de890247907f2e6f430008ec Mon Sep 17 00:00:00 2001
From: Jean Chalard <jchalard@google.com>
Date: Thu, 17 May 2012 17:05:30 +0900
Subject: [PATCH] Don't deactivate the LastComposedWord on shift

Bug: 6495116
Change-Id: Ib86de02a1216146082bf58a033982ac37fefffe1
---
 java/src/com/android/inputmethod/latin/LatinIME.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index b59e939b7..261755f53 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -1298,8 +1298,9 @@ public class LatinIME extends InputMethodService implements KeyboardActionListen
             break;
         }
         switcher.onCodeInput(primaryCode);
-        // Reset after any single keystroke
-        if (!didAutoCorrect)
+        // Reset after any single keystroke, except shift and symbol-shift
+        if (!didAutoCorrect && primaryCode != Keyboard.CODE_SHIFT
+                && primaryCode != Keyboard.CODE_SWITCH_ALPHA_SYMBOL)
             mLastComposedWord.deactivate();
         mEnteredText = null;
     }