Merge change I9589f9c2 into eclair-mr2 (6dba0680) · Commits · e / os / android_frameworks_base

core/java/android/app/ISearchManager.aidl

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,11 +16,11 @@

		package android.app;

		import android.app.SearchableInfo;
		import android.app.ISearchManagerCallback;
		import android.content.ComponentName;
		import android.content.res.Configuration;
		import android.os.Bundle;
		import android.server.search.SearchableInfo;

		/** @hide */
		interface ISearchManager {

+0 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,6 @@ import android.os.IBinder;
		import android.os.RemoteException;
		import android.os.SystemClock;
		import android.provider.Browser;
		import android.server.search.SearchableInfo;
		import android.speech.RecognizerIntent;
		import android.text.Editable;
		import android.text.InputType;

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.os.Bundle;
		import android.os.Handler;
		import android.os.RemoteException;
		import android.os.ServiceManager;
		import android.server.search.SearchableInfo;
		import android.text.TextUtils;
		import android.util.Log;
		import android.view.KeyEvent;

+1 −1

Original line number	Diff line number	Diff line
		@@ -14,6 +14,6 @@
		* limitations under the License.
		*/

		package android.server.search;
		package android.app;

		parcelable SearchableInfo;

+5 −1

Original line number	Diff line number	Diff line
		@@ -14,7 +14,7 @@
		* limitations under the License.
		*/

		package android.server.search;
		package android.app;

		import org.xmlpull.v1.XmlPullParser;
		import org.xmlpull.v1.XmlPullParserException;
		@@ -37,6 +37,10 @@ import android.view.inputmethod.EditorInfo;
		import java.io.IOException;
		import java.util.HashMap;

		/**
		*
		* @hide Pending API council approval
		*/
		public final class SearchableInfo implements Parcelable {

		// general debugging support