Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2126aac7 authored by Bjorn Bringert's avatar Bjorn Bringert
Browse files

Move android.server.search.SearchableInfo to android.app 

We need to expose SearchableInfo in the SDK in order to unbundle
Quick Search Box. Since the android.server.search package is
hidden, I'm moving SearchableInfo to android.app, where
SearchManager lives.

This change doesn't actually expose SearchableInfo. I'll do
that in a separate change to keep the change that
api-council needs to review small.

This is part of the fix for: http://b/issue?id=2270838

Change-Id: I9589f9c2c11d36c958beedff8245fe0c3319c6ba
parent 03cb1f15

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 {

core/java/android/app/SearchDialog.java

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

core/java/android/app/SearchManager.java

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

core/java/android/server/search/SearchableInfo.aidl→core/java/android/app/SearchableInfo.aidl

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

core/java/android/server/search/SearchableInfo.java→core/java/android/app/SearchableInfo.java

+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