Merge remote branch 'goog/master' into merge

Conflicts:
	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-es-rUS/strings.xml
	java/res/values-es/strings.xml
	java/res/values-fr/strings.xml
	java/res/values-it/strings.xml
	java/res/values-ja/strings.xml
	java/res/values-ko/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-ru/strings.xml
	java/res/values-sv/strings.xml
	java/res/values-tr/strings.xml
	java/res/values-xlarge/dimens.xml
	java/res/values-zh-rCN/strings.xml
	java/res/values-zh-rTW/strings.xml
	java/res/values/bools.xml
	java/res/xml/kbd_qwerty_rows.xml
	java/res/xml/method.xml
	java/res/xml/prefs.xml

Change-Id: I8768d16965e6e82c14ee742b9ada56438497eb86

java/Android.mk

@@ -17,6 +17,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common
 
 LOCAL_SDK_VERSION := current
 
-LOCAL_PROGUARD_FLAGS := -include $(LOCAL_PATH)/proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := proguard.flags
 
 include $(BUILD_PACKAGE)

java/AndroidManifest.xml

@@ -10,7 +10,7 @@
     <uses-permission android:name="android.permission.READ_CONTACTS" />
 
     <application android:label="@string/english_ime_name"
-            android:backupAgent="LatinIMEBackupAgent"
+            android:backupAgent="BackupAgent"
             android:killAfterRestore="false">
 
         <service android:name="LatinIME"
@@ -22,7 +22,13 @@
             <meta-data android:name="android.view.im" android:resource="@xml/method" />
         </service>
 
-        <activity android:name="LatinIMESettings" android:label="@string/english_ime_settings">
+        <activity android:name="Settings" android:label="@string/english_ime_settings">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN"/>
+            </intent-filter>
+        </activity>
+
+        <activity android:name="DebugSettings" android:label="@string/english_ime_debug_settings">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
             </intent-filter>

java/proguard.flags

@@ -5,4 +5,12 @@
 
 -keep class com.android.inputmethod.latin.Suggest {
   <init>(...);
+  com.android.inputmethod.latin.SuggestedWords getSuggestions(...);
+}
+
+-keep class com.android.inputmethod.latin.UserBigramDictionary {
+  void setDatabaseMax(int);
+  void setDatabaseDelete(int);
+  void waitUntilUpdateDBDone();
+  void waitForDictionaryLoading();
 }

java/res/anim/key_preview_fadein.xml

@@ -17,14 +17,13 @@
 ** limitations under the License.
 */
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
-    <string name="alternates_for_a">àáâãäåæ</string>
+<set
-    <string name="alternates_for_e">èéêë</string>
+    xmlns:android="http://schemas.android.com/apk/res/android"
-    <string name="alternates_for_i">ìíîï</string>
+    android:interpolator="@android:anim/decelerate_interpolator"
-    <string name="alternates_for_o">òóôõöœø</string>
+>
-    <string name="alternates_for_u">ùúûü</string>
+    <alpha
-    <string name="alternates_for_s">§ß</string>
+        android:fromAlpha="0.5"
-    <string name="alternates_for_n">ñ</string>
+        android:toAlpha="1.0"
-    <string name="alternates_for_c">ç</string>
+        android:duration="@integer/config_preview_fadein_anim_time" />
-    <string name="alternates_for_y">ýÿ</string>
+</set>
-</resources>

java/res/anim/key_preview_fadeout.xml

@@ -17,14 +17,13 @@
 ** limitations under the License.
 */
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
-    <string name="alternates_for_a">àáâãäåæ</string>
+<set
-    <string name="alternates_for_e">3èéêë</string>
+    xmlns:android="http://schemas.android.com/apk/res/android"
-    <string name="alternates_for_i">ìíîï8</string>
+    android:interpolator="@android:anim/accelerate_interpolator"
-    <string name="alternates_for_o">òóôõöœø9</string>
+>
-    <string name="alternates_for_u">ùúûü7</string>
+    <alpha
-    <string name="alternates_for_s">§ß</string>
+        android:fromAlpha="1.0"
-    <string name="alternates_for_n">ñ</string>
+        android:toAlpha="0.0"
-    <string name="alternates_for_c">ç</string>
+        android:duration="@integer/config_preview_fadeout_anim_time" />
-    <string name="alternates_for_y">ýÿ6</string>
+</set>
-</resources>

java/res/anim/mini_keyboard_fadein.xml

@@ -17,14 +17,13 @@
 ** limitations under the License.
 */
 -->
-<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
-    <string name="alternates_for_a">àáâãäåæ</string>
+<set
-    <string name="alternates_for_e">3èéêë</string>
+    xmlns:android="http://schemas.android.com/apk/res/android"
-    <string name="alternates_for_i">ìíîï8</string>
+    android:interpolator="@android:anim/decelerate_interpolator"
-    <string name="alternates_for_o">òóôõöœø9</string>
+>
-    <string name="alternates_for_u">ùúûü7</string>
+    <alpha
-    <string name="alternates_for_s">§ß</string>
+        android:fromAlpha="0.5"
-    <string name="alternates_for_n">ñ</string>
+        android:toAlpha="1.0"
-    <string name="alternates_for_c">ç</string>
+        android:duration="@integer/config_preview_fadein_anim_time" />
-    <string name="alternates_for_y">ýÿ6</string>
+</set>
-</resources>

java/res/anim/mini_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_preview_fadeout_anim_time" />
+</set>