drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change I9589f9c2 into eclair-mr2

Browse Source 
* changes:
  Move android.server.search.SearchableInfo to android.app
This commit is contained in:
Android (Google) Code Review
2009-12-05 10:21:01 -08:00
parent d1b3988adf 2126aac7f9
commit 6dba0680cd
10 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/java/android/app/ISearchManager.aidl
View File

@ -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 {

1
core/java/android/app/SearchDialog.java
View File

@ -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;

1
core/java/android/app/SearchManager.java
View File

@ -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;

2
core/java/android/server/search/SearchableInfo.aidl → core/java/android/app/SearchableInfo.aidl
View File

@ -14,6 +14,6 @@
* limitations under the License.
*/
package android.server.search;
package android.app;
parcelable SearchableInfo;

6
core/java/android/server/search/SearchableInfo.java → core/java/android/app/SearchableInfo.java
View File

@ -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

1
core/java/android/app/SuggestionsAdapter.java
View File

@ -31,7 +31,6 @@ import android.graphics.drawable.Drawable;
import android.graphics.drawable.StateListDrawable;
import android.net.Uri;
import android.os.Bundle;
import android.server.search.SearchableInfo;
import android.text.Html;
import android.text.TextUtils;
import android.util.Log;

1
core/java/android/server/search/SearchManagerService.java
View File

@ -21,6 +21,7 @@ import android.app.IActivityWatcher;
import android.app.ISearchManager;
import android.app.ISearchManagerCallback;
import android.app.SearchManager;
import android.app.SearchableInfo;
import android.content.BroadcastReceiver;
import android.content.ComponentName;
import android.content.Context;

1
core/java/android/server/search/Searchables.java
View File

@ -19,6 +19,7 @@ package android.server.search;
import com.android.internal.app.ResolverActivity;
import android.app.SearchManager;
import android.app.SearchableInfo;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;

2
tests/AndroidTests/src/com/android/unit_tests/SearchManagerTest.java
View File

@ -21,10 +21,10 @@ import com.android.unit_tests.activity.LocalActivity;
import android.app.Activity;
import android.app.ISearchManager;
import android.app.SearchManager;
import android.app.SearchableInfo;
import android.content.ComponentName;
import android.content.Context;
import android.os.ServiceManager;
import android.server.search.SearchableInfo;
import android.test.ActivityInstrumentationTestCase2;
import android.test.suitebuilder.annotation.LargeTest;
import android.test.suitebuilder.annotation.MediumTest;

4
tests/AndroidTests/src/com/android/unit_tests/SearchablesTest.java
View File

@ -17,6 +17,8 @@
package com.android.unit_tests;
import android.app.SearchManager;
import android.app.SearchableInfo;
import android.app.SearchableInfo.ActionKeyInfo;
import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
@ -28,9 +30,7 @@ import android.content.pm.ResolveInfo;
import android.content.res.Resources;
import android.content.res.XmlResourceParser;
import android.os.RemoteException;
import android.server.search.SearchableInfo;
import android.server.search.Searchables;
import android.server.search.SearchableInfo.ActionKeyInfo;
import android.test.AndroidTestCase;
import android.test.MoreAsserts;
import android.test.mock.MockContext;