Merge remote-tracking branch 'goog/master' into mergescript

Conflicts:
	CleanSpec.mk
	java/Android.mk
	java/res/drawable-large-hdpi/btn_keyboard_key_popup_selected_holo.9.png
	java/res/drawable-large-hdpi/hint_popup_holo.9.png
	java/res/drawable-large-hdpi/sym_keyboard_numsymbol_holo.png
	java/res/drawable-large-hdpi/sym_keyboard_tab_holo.png
	java/res/drawable-large-land-hdpi/hint_popup_holo.9.png
	java/res/drawable-large-land-mdpi/hint_popup_holo.9.png
	java/res/drawable-large-land-xhdpi/hint_popup_holo.9.png
	java/res/drawable-large-mdpi/btn_keyboard_key_dark_normal_holo.9.png
	java/res/drawable-large-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
	java/res/drawable-large-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
	java/res/drawable-large-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
	java/res/drawable-large-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
	java/res/drawable-large-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
	java/res/drawable-large-mdpi/btn_keyboard_key_light_normal_holo.9.png
	java/res/drawable-large-mdpi/btn_keyboard_key_light_pressed_holo.9.png
	java/res/drawable-large-mdpi/btn_keyboard_key_popup_selected_holo.9.png
	java/res/drawable-large-mdpi/hint_popup_holo.9.png
	java/res/drawable-large-mdpi/keyboard_background_holo.9.png
	java/res/drawable-large-mdpi/keyboard_popup_panel_background_holo.9.png
	java/res/drawable-large-mdpi/keyboard_suggest_strip_holo.9.png
	java/res/drawable-large-mdpi/sym_keyboard_delete_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_num0_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_num1_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_num2_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_num3_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_num4_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_num5_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_num6_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_num7_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_num8_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_num9_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_numbpound_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_numbstar_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_numsymbol_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_return_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_settings_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_shift_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_shift_locked_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_space_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_tab_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_voice_holo.png
	java/res/drawable-large-mdpi/sym_keyboard_voice_off_holo.png
	java/res/drawable-large-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
	java/res/drawable-large-xhdpi/hint_popup_holo.9.png
	java/res/drawable-large-xhdpi/sym_keyboard_numsymbol_holo.png
	java/res/drawable-large-xhdpi/sym_keyboard_tab_holo.png
	java/res/drawable-xlarge-hdpi/btn_keyboard_key_popup_selected_holo.9.png
	java/res/drawable-xlarge-hdpi/hint_popup_holo.9.png
	java/res/drawable-xlarge-land-hdpi/hint_popup_holo.9.png
	java/res/drawable-xlarge-land-mdpi/hint_popup_holo.9.png
	java/res/drawable-xlarge-land-xhdpi/hint_popup_holo.9.png
	java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_normal_holo.9.png
	java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_normal_off_holo.9.png
	java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_normal_on_holo.9.png
	java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_pressed_holo.9.png
	java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_pressed_off_holo.9.png
	java/res/drawable-xlarge-mdpi/btn_keyboard_key_dark_pressed_on_holo.9.png
	java/res/drawable-xlarge-mdpi/btn_keyboard_key_light_normal_holo.9.png
	java/res/drawable-xlarge-mdpi/btn_keyboard_key_light_pressed_holo.9.png
	java/res/drawable-xlarge-mdpi/btn_keyboard_key_popup_selected_holo.9.png
	java/res/drawable-xlarge-mdpi/hint_popup_holo.9.png
	java/res/drawable-xlarge-mdpi/keyboard_background_holo.9.png
	java/res/drawable-xlarge-mdpi/keyboard_popup_panel_background_holo.9.png
	java/res/drawable-xlarge-mdpi/keyboard_suggest_strip_holo.9.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_delete_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_num0_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_num1_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_num2_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_num3_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_num4_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_num5_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_num6_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_num7_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_num8_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_num9_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_numbpound_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_numbstar_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_return_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_settings_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_shift_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_shift_locked_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_space_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_voice_holo.png
	java/res/drawable-xlarge-mdpi/sym_keyboard_voice_off_holo.png
	java/res/drawable-xlarge-xhdpi/btn_keyboard_key_popup_selected_holo.9.png
	java/res/drawable-xlarge-xhdpi/hint_popup_holo.9.png
	java/res/layout-xlarge/recognition_status.xml
	java/res/values-af/strings.xml
	java/res/values-am/strings.xml
	java/res/values-ar/strings.xml
	java/res/values-be/strings.xml
	java/res/values-bg/strings.xml
	java/res/values-ca/strings.xml
	java/res/values-cs/strings.xml
	java/res/values-da/strings.xml
	java/res/values-de/strings.xml
	java/res/values-el/strings.xml
	java/res/values-en-rGB/strings.xml
	java/res/values-es-rUS/strings.xml
	java/res/values-es/strings.xml
	java/res/values-et/strings.xml
	java/res/values-fa/strings.xml
	java/res/values-fi/strings.xml
	java/res/values-fr/strings.xml
	java/res/values-hi/strings.xml
	java/res/values-hr/strings.xml
	java/res/values-hu/strings.xml
	java/res/values-in/strings.xml
	java/res/values-it/strings.xml
	java/res/values-iw/strings.xml
	java/res/values-ja/strings.xml
	java/res/values-ko/strings.xml
	java/res/values-large/donottranslate.xml
	java/res/values-lt/strings.xml
	java/res/values-lv/strings.xml
	java/res/values-ms/strings.xml
	java/res/values-nb/strings.xml
	java/res/values-nl/strings.xml
	java/res/values-pl/strings.xml
	java/res/values-pt-rPT/strings.xml
	java/res/values-pt/strings.xml
	java/res/values-rm/strings.xml
	java/res/values-ro/strings.xml
	java/res/values-ru/strings.xml
	java/res/values-sk/strings.xml
	java/res/values-sl/strings.xml
	java/res/values-sr/strings.xml
	java/res/values-sv/strings.xml
	java/res/values-sw/strings.xml
	java/res/values-sw600dp/donottranslate.xml
	java/res/values-sw768dp/donottranslate.xml
	java/res/values-th/strings.xml
	java/res/values-tl/strings.xml
	java/res/values-tr/strings.xml
	java/res/values-uk/strings.xml
	java/res/values-vi/strings.xml
	java/res/values-xlarge/donottranslate.xml
	java/res/values-zh-rCN/strings.xml
	java/res/values-zh-rTW/strings.xml
	java/res/values-zu/strings.xml
	java/res/values/keypress-vibration-durations.xml
	java/res/values/predefined-subtypes.xml
	java/res/xml-large-land/kbd_popup_template.xml
	java/res/xml-large/kbd_key_styles.xml
	java/res/xml-large/kbd_popup_template.xml
	java/res/xml-large/kbd_qwerty_f2.xml
	java/res/xml-large/kbd_qwerty_row1.xml
	java/res/xml-large/kbd_qwerty_row2.xml
	java/res/xml-large/kbd_qwerty_row3.xml
	java/res/xml-large/kbd_qwerty_row4.xml
	java/res/xml-large/kbd_row3_right.xml
	java/res/xml-large/kbd_rows_arabic.xml
	java/res/xml-large/kbd_rows_azerty.xml
	java/res/xml-large/kbd_rows_hebrew.xml
	java/res/xml-large/kbd_rows_qwerty.xml
	java/res/xml-large/kbd_rows_qwertz.xml
	java/res/xml-large/kbd_rows_russian.xml
	java/res/xml-large/kbd_rows_scandinavian.xml
	java/res/xml-large/kbd_rows_serbian.xml
	java/res/xml-large/kbd_rows_spanish.xml
	java/res/xml-large/kbd_symbols.xml
	java/res/xml-large/kbd_symbols_shift.xml
	java/res/xml-sw600dp-land/kbd_more_keys_keyboard_template.xml
	java/res/xml-sw600dp-land/kbd_popup_template.xml
	java/res/xml-sw600dp/kbd_more_keys_keyboard_template.xml
	java/res/xml-sw600dp/kbd_popup_template.xml
	java/res/xml-sw600dp/kbd_row3_right.xml
	java/res/xml-sw600dp/kbd_rows_qwerty.xml
	java/res/xml-sw600dp/keys_comma_period.xml
	java/res/xml-sw768dp-land/kbd_more_keys_keyboard_template.xml
	java/res/xml-sw768dp-land/kbd_popup_template.xml
	java/res/xml-sw768dp/kbd_more_keys_keyboard_template.xml
	java/res/xml-sw768dp/kbd_popup_template.xml
	java/res/xml-sw768dp/kbd_row3_right2.xml
	java/res/xml-sw768dp/kbd_rows_qwerty.xml
	java/res/xml-sw768dp/row_symbols_shift4.xml
	java/res/xml-xlarge-land/kbd_popup_template.xml
	java/res/xml-xlarge/kbd_key_styles.xml
	java/res/xml-xlarge/kbd_popup_template.xml
	java/res/xml-xlarge/kbd_qwerty_row1.xml
	java/res/xml-xlarge/kbd_qwerty_row2.xml
	java/res/xml-xlarge/kbd_qwerty_row3.xml
	java/res/xml-xlarge/kbd_qwerty_row4.xml
	java/res/xml-xlarge/kbd_row3_right2.xml
	java/res/xml-xlarge/kbd_rows_arabic.xml
	java/res/xml-xlarge/kbd_rows_azerty.xml
	java/res/xml-xlarge/kbd_rows_hebrew.xml
	java/res/xml-xlarge/kbd_rows_qwerty.xml
	java/res/xml-xlarge/kbd_rows_qwertz.xml
	java/res/xml-xlarge/kbd_rows_russian.xml
	java/res/xml-xlarge/kbd_rows_scandinavian.xml
	java/res/xml-xlarge/kbd_rows_serbian.xml
	java/res/xml-xlarge/kbd_rows_spanish.xml
	java/res/xml-xlarge/kbd_symbols.xml
	java/res/xml-xlarge/kbd_symbols_shift.xml
	java/res/xml/key_azerty_quote.xml
	java/res/xml/key_f1.xml
	java/res/xml/method.xml
	java/src/com/android/inputmethod/compat/InputMethodServiceCompatWrapper.java
	java/src/com/android/inputmethod/latin/Utils.java
	native/Android.mk

Change-Id: I96e8e042f636ed8e5cc023cf8514f13121e39195

Android.mk

@@ -12,6 +12,4 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-LOCAL_PATH := $(call my-dir)
+include $(call all-subdir-makefiles)
-
-include $(call all-makefiles-under,$(LOCAL_PATH))

CleanSpec.mk

@@ -47,7 +47,10 @@
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/LatinIME*)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/LatinIME.apk)
 
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime2_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libjni_latinime_intermediates)
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************

dictionaries/sample.xml

@@ -2,7 +2,9 @@
      for use by the Latin IME.
      The format of the word list is a flat list of word entries.
      Each entry has a frequency between 255 and 0.
-     Highest frequency words get more weight in the prediction algorithm.
+     Highest frequency words get more weight in the prediction algorithm. As a
+     special case, a weight of 0 is taken to mean profanity - words that should
+     not be considered a typo, but that should never be suggested explicitly.
      You can capitalize words that must always be capitalized, such as "January".
      You can have a capitalized and a non-capitalized word as separate entries,
      such as "robin" and "Robin".
@@ -13,4 +15,3 @@
   <w f="128">sample</w>
   <w f="1">wordlist</w>
 </wordlist>
-

java/Android.mk

@@ -1,3 +1,17 @@
+# Copyright (C) 2011 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
@@ -9,9 +23,14 @@ LOCAL_PACKAGE_NAME := LatinIME
 
 LOCAL_CERTIFICATE := shared
 
-LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime2
+# We want to package libjni_latinime.so into the apk.
+LOCAL_JNI_SHARED_LIBRARIES := libjni_latinime
+# We want to install libjni_latinime.so to the system partition if LatinIME gets installed.
+LOCAL_REQUIRED_MODULES := libjni_latinime
 
 LOCAL_STATIC_JAVA_LIBRARIES := android-common
+LOCAL_STATIC_JAVA_LIBRARIES += inputmethod-common
+LOCAL_STATIC_JAVA_LIBRARIES += android-support-v4
 
 # Do not compress dictionary files to mmap dict data runtime
 LOCAL_AAPT_FLAGS := -0 .dict

java/AndroidManifest.xml

@@ -1,19 +1,19 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
+        coreApp="true"
         package="com.android.inputmethod.latin">
 
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.READ_USER_DICTIONARY" />
-    <uses-permission android:name="android.permission.WRITE_USER_DICTIONARY" />
-    <uses-permission android:name="android.permission.RECORD_AUDIO" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
 
-    <application android:label="@string/english_ime_name"
+    <application android:label="@string/aosp_android_keyboard_ime_name"
+            android:icon="@drawable/ic_ime_settings"
             android:backupAgent="BackupAgent"
             android:killAfterRestore="false">
 
         <service android:name="LatinIME"
-                android:label="@string/english_ime_name"
+                android:label="@string/aosp_android_keyboard_ime_name"
                 android:permission="android.permission.BIND_INPUT_METHOD">
             <intent-filter>
                 <action android:name="android.view.InputMethod" />
@@ -21,24 +21,32 @@
             <meta-data android:name="android.view.im" android:resource="@xml/method" />
         </service>
 
-        <activity android:name="Settings" android:label="@string/english_ime_settings">
+        <service android:name=".spellcheck.AndroidSpellCheckerService"
+                 android:label="@string/spell_checker_service_name"
+                 android:permission="android.permission.BIND_TEXT_SERVICE">
+            <intent-filter>
+                <action android:name="android.service.textservice.SpellCheckerService" />
+            </intent-filter>
+            <meta-data android:name="android.view.textservice.scs" android:resource="@xml/spellchecker" />
+        </service>
+
+        <activity android:name="SettingsActivity" android:label="@string/english_ime_settings"
+                  android:uiOptions="splitActionBarWhenNarrow">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
 
-        <activity android:name="DebugSettings" android:label="@string/english_ime_debug_settings">
+        <activity android:name="com.android.inputmethod.latin.spellcheck.SpellCheckerSettingsActivity"
+                  android:label="@string/android_spell_checker_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>
         </activity>
 
-        <activity android:name="com.android.inputmethod.deprecated.languageswitcher.InputLanguageSelection"
+        <activity android:name="DebugSettingsActivity" android:label="@string/english_ime_debug_settings">
-                android:label="@string/language_selection_title">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
-                <action android:name="com.android.inputmethod.latin.INPUT_LANGUAGE_SELECTION"/>
-                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 

java/proguard.flags

@@ -1,6 +1,14 @@
 -keep class com.android.inputmethod.latin.BinaryDictionary {
   int mDictLength;
-  <init>(...); 
+  <init>(...);
+}
+
+-keep class com.android.inputmethod.latin.Flag {
+  *;
+}
+
+-keep class com.android.inputmethod.keyboard.ProximityInfo {
+  <init>(com.android.inputmethod.keyboard.ProximityInfo);
 }
 
 -keep class com.android.inputmethod.latin.Suggest {
@@ -8,13 +16,6 @@
   com.android.inputmethod.latin.SuggestedWords getSuggestions(...);
 }
 
--keep class com.android.inputmethod.latin.UserBigramDictionary {
-  void setDatabaseMax(int);
-  void setDatabaseDelete(int);
-  void waitUntilUpdateDBDone();
-  void waitForDictionaryLoading();
-}
-
 -keep class com.android.inputmethod.latin.AutoCorrection {
   java.lang.CharSequence getAutoCorrectionWord();
 }
@@ -23,6 +24,32 @@
   boolean equalsIgnoreCase(...);
 }
 
--keep class com.android.inputmethod.latin.spellcheck.SpellChecker {
+-keep class com.android.inputmethod.latin.spellcheck.SpellCheckerSettingsFragment {
   *;
 }
+
+-keep class com.android.inputmethod.keyboard.LatinKeyboardView {
+  # Keep getter/setter methods for ObjectAnimator
+  int getLanguageOnSpacebarAnimAlpha();
+  void setLanguageOnSpacebarAnimAlpha(int);
+  int getAltCodeKeyWhileTypingAnimAlpha();
+  void setAltCodeKeyWhileTypingAnimAlpha(int);
+}
+
+-keep class com.android.inputmethod.keyboard.MoreKeysKeyboard$Builder$MoreKeysKeyboardParams {
+  <init>(...);
+}
+
+-keep class com.android.inputmethod.latin.ResearchLogger {
+  void flush();
+}
+
+-keep class com.android.inputmethod.keyboard.KeyboardLayoutSet$Builder {
+  void setTouchPositionCorrectionEnabled(...);
+}
+
+# The support library contains references to newer platform versions.
+# Don't warn about those in case this app is linking against an older
+# platform version.  We know about them, and they are safe.
+-dontwarn android.support.v4.**
+-dontwarn android.support.v13.**

java/res/anim/alt_code_key_while_typing_fadein.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<objectAnimator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:propertyName="altCodeKeyWhileTypingAnimAlpha"
+    android:valueType="intType"
+    android:duration="1000"
+    android:valueFrom="128"
+    android:valueTo="255" />

java/res/anim/alt_code_key_while_typing_fadeout.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<objectAnimator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:propertyName="altCodeKeyWhileTypingAnimAlpha"
+    android:valueType="intType"
+    android:duration="3000"
+    android:valueFrom="255"
+    android:valueTo="128" />

java/res/anim/language_on_spacebar_fadeout.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2012, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<objectAnimator
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:propertyName="languageOnSpacebarAnimAlpha"
+    android:valueType="intType"
+    android:startOffset="1200"
+    android:duration="200"
+    android:valueFrom="255"
+    android:valueTo="@integer/config_language_on_spacebar_final_alpha" />

java/res/anim/mini_keyboard_fadein.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<set
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/decelerate_interpolator"
->
-    <alpha
-        android:fromAlpha="0.5"
-        android:toAlpha="1.0"
-        android:duration="@integer/config_mini_keyboard_fadein_anim_time" />
-</set>

java/res/anim/mini_keyboard_fadeout.xml

@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-**
-** Copyright 2010, The Android Open Source Project
-**
-** Licensed under the Apache License, Version 2.0 (the "License");
-** you may not use this file except in compliance with the License.
-** You may obtain a copy of the License at
-**
-**     http://www.apache.org/licenses/LICENSE-2.0
-**
-** Unless required by applicable law or agreed to in writing, software
-** distributed under the License is distributed on an "AS IS" BASIS,
-** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-** See the License for the specific language governing permissions and
-** limitations under the License.
-*/
--->
-
-<set
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:interpolator="@android:anim/accelerate_interpolator"
->
-    <alpha
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0"
-        android:duration="@integer/config_mini_keyboard_fadeout_anim_time" />
-</set>

java/res/anim/more_keys_keyboard_fadein.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/decelerate_interpolator"
+>
+    <alpha
+        android:fromAlpha="0.5"
+        android:toAlpha="1.0"
+        android:duration="@integer/config_more_keys_keyboard_fadein_anim_time" />
+</set>

java/res/anim/more_keys_keyboard_fadeout.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+**
+** Copyright 2010, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+**     http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<set
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:interpolator="@android:anim/accelerate_interpolator"
+>
+    <alpha
+        android:fromAlpha="1.0"
+        android:toAlpha="0.0"
+        android:duration="@integer/config_more_keys_keyboard_fadeout_anim_time" />
+</set>