commit 8b56ad7814455f3b5e1c012aea9a5e02153ab199
author Tadashi G. Takaoka <takaoka@google.com> Tue May 14 12:01:46 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 14 12:01:47 2013 +0000
tree bdd67a4e484333d631ec59f8194842a0f916cb5f
parent d78c776b7b900a8525daa0e2a455a596d4663848
parent 7348d9fb72bf9e85fbbf8ffd8328d4c26f1c8d0c

Merge "Revise welcome screen video and still image"

java/res/values/dimens.xml

diff --git a/java/res/values/dimens.xml b/java/res/values/dimens.xml
index b6413b3..98ae76c 100644
--- a/java/res/values/dimens.xml
+++ b/java/res/values/dimens.xml
@@ -102,7 +102,7 @@
 
     <!-- Gesture trail parameters -->
     <!-- Minimum distance between gesture trail sampling points. -->
-    <dimen name="gesture_trail_min_sampling_distance">6.4dp</dimen>
+    <dimen name="gesture_trail_min_sampling_distance">9.6dp</dimen>
     <!-- Maximum angular threshold between gesture trails interpolation segments in degree. -->
     <integer name="gesture_trail_max_interpolation_angular_threshold">15</integer>
     <!-- Maximum distance threshold between gesture trails interpolation segments. -->

java/src/com/android/inputmethod/latin/LatinIME.java

diff --git a/java/src/com/android/inputmethod/latin/LatinIME.java b/java/src/com/android/inputmethod/latin/LatinIME.java
index e4594ac..9caec55 100644
--- a/java/src/com/android/inputmethod/latin/LatinIME.java
+++ b/java/src/com/android/inputmethod/latin/LatinIME.java
@@ -2109,25 +2109,16 @@
     }
 
     private boolean isSuggestionsStripVisible() {
-        final MainKeyboardView mainKeyboardView = mKeyboardSwitcher.getMainKeyboardView();
-        if (null == mainKeyboardView || !mainKeyboardView.isShown()) {
+        if (mSuggestionStripView == null)
             return false;
-        }
-        if (mSuggestionStripView == null) {
-            return false;
-        }
-        if (mSuggestionStripView.isShowingAddToDictionaryHint()) {
+        if (mSuggestionStripView.isShowingAddToDictionaryHint())
             return true;
-        }
-        if (null == mSettings.getCurrent()) {
+        if (null == mSettings.getCurrent())
             return false;
-        }
-        if (!mSettings.getCurrent().isSuggestionStripVisibleInOrientation(mDisplayOrientation)) {
+        if (!mSettings.getCurrent().isSuggestionStripVisibleInOrientation(mDisplayOrientation))
             return false;
-        }
-        if (mSettings.getCurrent().isApplicationSpecifiedCompletionsOn()) {
+        if (mSettings.getCurrent().isApplicationSpecifiedCompletionsOn())
             return true;
-        }
         return mSettings.getCurrent().isSuggestionsRequested(mDisplayOrientation);
     }