From bfd3b8bf86273770e37499e8bcc0623e11f118cf Mon Sep 17 00:00:00 2001
From: Ken Wakasa <kwakasa@google.com>
Date: Tue, 18 May 2010 11:01:46 +0900
Subject: [PATCH] Restore the original-package entry to support
 overwrite-install with the old package name.

Change-Id: I1ddbcb3e1b41ef7d0e4017d7de11b600ec645197
---
 java/Android.mk          | 2 +-
 java/AndroidManifest.xml | 3 +--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/java/Android.mk b/java/Android.mk
index 97c906f26..9b2e47da4 100755
--- a/java/Android.mk
+++ b/java/Android.mk
@@ -15,7 +15,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := android-common
 
 #LOCAL_AAPT_FLAGS := -0 .dict
 # The following flag is required because we use a different package name
-# com.google.android.inputmethod.latin2 in the LatinIME sandbox.
+# com.google.android.inputmethod.latin in the LatinIME sandbox.
 LOCAL_AAPT_FLAGS := --custom-package com.android.inputmethod.latin
 
 LOCAL_SDK_VERSION := current
diff --git a/java/AndroidManifest.xml b/java/AndroidManifest.xml
index 5f4791d1f..f87ce013b 100755
--- a/java/AndroidManifest.xml
+++ b/java/AndroidManifest.xml
@@ -1,8 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
         package="com.google.android.inputmethod.latin">
 
-    <!-- Do not override the default LatinIME for now -->
-    <!-- original-package android:name="com.android.inputmethod.latin" / -->
+    <original-package android:name="com.android.inputmethod.latin" />
 
     <uses-permission android:name="android.permission.VIBRATE"/>
     <uses-permission android:name="android.permission.READ_USER_DICTIONARY" />