commit 95d9e4710426363e5a52f7d1cdb25e1babbac788
author satok <satok@google.com> Tue Apr 19 23:15:37 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 19 23:15:37 2011 -0700
tree d5d0c0d3c9c5235afbcad4182d1fff2e17034a20
parent b1ae5d84b1bcb0e8c18e80a4ca13a81d9c9c2772
parent 015b21cf52fea1a96bf785c73ecb80b0b731cec3

Merge "Tweak voice layout for Dogfood"

java/res/xml/prefs.xml

diff --git a/java/res/xml/prefs.xml b/java/res/xml/prefs.xml
index afe7be9..cbfc3c3 100644
--- a/java/res/xml/prefs.xml
+++ b/java/res/xml/prefs.xml
@@ -107,7 +107,7 @@
         android:title="@string/prefs_enable_log"
         android:summary="@string/prefs_description_log"
         android:persistent="true"
-        android:defaultValue="false" />
+        android:defaultValue="true" />
     <ListPreference
         android:key="pref_keyboard_layout_20100902"
         android:title="@string/keyboard_layout"
@@ -115,12 +115,12 @@
         android:entryValues="@array/keyboard_layout_modes_values"
         android:entries="@array/keyboard_layout_modes"
         android:defaultValue="@string/config_default_keyboard_theme_id" />
-    <Preference
+    <!-- <Preference
         android:title="Debug Settings"
         android:key="debug_settings">
         <intent
             android:action="android.intent.action.MAIN"
             android:targetPackage="com.android.inputmethod.latin"
             android:targetClass="com.android.inputmethod.latin.DebugSettings" />
-    </Preference>
-</PreferenceScreen>
\ No newline at end of file
+    </Preference>-->
+</PreferenceScreen>

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

diff --git a/java/src/com/android/inputmethod/latin/SuggestedWords.java b/java/src/com/android/inputmethod/latin/SuggestedWords.java
index fe7aac7..a8cdfc0 100644
--- a/java/src/com/android/inputmethod/latin/SuggestedWords.java
+++ b/java/src/com/android/inputmethod/latin/SuggestedWords.java
@@ -32,14 +32,14 @@
     public final List<SuggestedWordInfo> mSuggestedWordInfoList;
 
     private SuggestedWords(List<CharSequence> words, boolean typedWordValid,
-            boolean hasMinamlSuggestion, List<SuggestedWordInfo> suggestedWordInfoList) {
+            boolean hasMinimalSuggestion, List<SuggestedWordInfo> suggestedWordInfoList) {
         if (words != null) {
             mWords = words;
         } else {
             mWords = Collections.emptyList();
         }
         mTypedWordValid = typedWordValid;
-        mHasMinimalSuggestion = hasMinamlSuggestion;
+        mHasMinimalSuggestion = hasMinimalSuggestion;
         mSuggestedWordInfoList = suggestedWordInfoList;
     }
 
@@ -113,8 +113,8 @@
             return this;
         }
 
-        public Builder setHasMinimalSuggestion(boolean hasMinamlSuggestion) {
-            mHasMinimalSuggestion = hasMinamlSuggestion;
+        public Builder setHasMinimalSuggestion(boolean hasMinimalSuggestion) {
+            mHasMinimalSuggestion = hasMinimalSuggestion;
             return this;
         }