Merge "Revert "Remove DialogInterface.OnDismissListener and... (ffb27d26) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −1

Original line number	Diff line number	Diff line
		@@ -6275,10 +6275,12 @@ package android.app {
		method @NonNull public android.app.RemoteInput.Builder setLabel(@Nullable CharSequence);
		}

		public class SearchManager {
		public class SearchManager implements android.content.DialogInterface.OnCancelListener android.content.DialogInterface.OnDismissListener {
		method public android.content.ComponentName getGlobalSearchActivity();
		method public android.app.SearchableInfo getSearchableInfo(android.content.ComponentName);
		method public java.util.List<android.app.SearchableInfo> getSearchablesInGlobalSearch();
		method @Deprecated public void onCancel(android.content.DialogInterface);
		method @Deprecated public void onDismiss(android.content.DialogInterface);
		method public void setOnCancelListener(android.app.SearchManager.OnCancelListener);
		method public void setOnDismissListener(android.app.SearchManager.OnDismissListener);
		method public void startSearch(String, boolean, android.content.ComponentName, android.os.Bundle, boolean);

api/system-current.txt

+1 −1

Original line number	Diff line number	Diff line
		@@ -695,7 +695,7 @@ package android.app {
		field @NonNull public static final android.os.Parcelable.Creator<android.app.RuntimeAppOpAccessMessage> CREATOR;
		}

		public class SearchManager {
		public class SearchManager implements android.content.DialogInterface.OnCancelListener android.content.DialogInterface.OnDismissListener {
		method public void launchAssist(@Nullable android.os.Bundle);
		}

core/java/android/app/SearchManager.java

+24 −17

Original line number	Diff line number	Diff line
		@@ -61,7 +61,8 @@ import java.util.List;
		* </div>
		*/
		@SystemService(Context.SEARCH_SERVICE)
		public class SearchManager {
		public class SearchManager
		implements DialogInterface.OnDismissListener, DialogInterface.OnCancelListener {

		private static final boolean DBG = false;
		private static final String TAG = "SearchManager";
		@@ -638,22 +639,8 @@ public class SearchManager {
		private void ensureSearchDialog() {
		if (mSearchDialog == null) {
		mSearchDialog = new SearchDialog(mContext, this);
		mSearchDialog.setOnCancelListener(new DialogInterface.OnCancelListener() {
		@Override
		public void onCancel(DialogInterface dialog) {
		if (mCancelListener != null) {
		mCancelListener.onCancel();
		}
		}
		});
		mSearchDialog.setOnDismissListener(new DialogInterface.OnDismissListener() {
		@Override
		public void onDismiss(DialogInterface dialog) {
		if (mDismissListener != null) {
		mDismissListener.onDismiss();
		}
		}
		});
		mSearchDialog.setOnCancelListener(this);
		mSearchDialog.setOnDismissListener(this);
		}
		}

		@@ -844,6 +831,26 @@ public class SearchManager {
		mCancelListener = listener;
		}

		/**
		* @deprecated This method is an obsolete internal implementation detail. Do not use.
		*/
		@Deprecated
		public void onCancel(DialogInterface dialog) {
		if (mCancelListener != null) {
		mCancelListener.onCancel();
		}
		}

		/**
		* @deprecated This method is an obsolete internal implementation detail. Do not use.
		*/
		@Deprecated
		public void onDismiss(DialogInterface dialog) {
		if (mDismissListener != null) {
		mDismissListener.onDismiss();
		}
		}

		/**
		* Gets information about a searchable activity.
		*