Merge "Refresh the all apps container search result when apps are installed"... (75df256c) · Commits · e / os / android_packages_apps_Trebuchet

src/com/android/launcher3/allapps/AllAppsContainerView.java

+3 −0

Original line number	Diff line number	Diff line
		@@ -210,6 +210,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
		*/
		public void addApps(List<AppInfo> apps) {
		mApps.addApps(apps);
		mSearchBarController.refreshSearchResult();
		}

		/**
		@@ -217,6 +218,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
		*/
		public void updateApps(List<AppInfo> apps) {
		mApps.updateApps(apps);
		mSearchBarController.refreshSearchResult();
		}

		/**
		@@ -224,6 +226,7 @@ public class AllAppsContainerView extends BaseContainerView implements DragSourc
		*/
		public void removeApps(List<AppInfo> apps) {
		mApps.removeApps(apps);
		mSearchBarController.refreshSearchResult();
		}

		public void setSearchBarVisible(boolean visible) {

+14 −3

Original line number	Diff line number	Diff line
		@@ -45,6 +45,7 @@ public abstract class AllAppsSearchBarController
		protected AlphabeticalAppsList mApps;
		protected Callbacks mCb;
		protected ExtendedEditText mInput;
		private String mQuery;

		protected DefaultAppSearchAlgorithm mSearchAlgorithm;
		protected InputMethodManager mInputMethodManager;
		@@ -90,14 +91,23 @@ public abstract class AllAppsSearchBarController

		@Override
		public void afterTextChanged(final Editable s) {
		String query = s.toString();
		if (query.isEmpty()) {
		mQuery = s.toString();
		if (mQuery.isEmpty()) {
		mSearchAlgorithm.cancel(true);
		mCb.clearSearchResult();
		} else {
		mSearchAlgorithm.cancel(false);
		mSearchAlgorithm.doSearch(query, mCb);
		mSearchAlgorithm.doSearch(mQuery, mCb);
		}
		}

		protected void refreshSearchResult() {
		if (mQuery == null) {
		return;
		}
		// If play store continues auto updating an app, we want to show partial result.
		mSearchAlgorithm.cancel(false);
		mSearchAlgorithm.doSearch(mQuery, mCb);
		}

		@Override
		@@ -130,6 +140,7 @@ public abstract class AllAppsSearchBarController
		* Resets the search bar state.
		*/
		public void reset() {
		mQuery = null;
		unfocusSearchField();
		mCb.clearSearchResult();
		mInput.setText("");