Merge "Support stylus handwriting in settings search bar" into udc-dev (037eda89) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/search/SearchFeatureProvider.java

+16 −8

Original line number	Diff line number	Diff line
		@@ -126,7 +126,16 @@ public interface SearchFeatureProvider {
		true /* finishSecondaryWithPrimary */,
		false /* clearTop */);

		toolbar.setOnClickListener(tb -> {
		toolbar.setOnClickListener(tb -> startSearchActivity(context, activity, pageId, intent));

		toolbar.setHandwritingDelegatorCallback(
		() -> startSearchActivity(context, activity, pageId, intent));
		toolbar.setAllowedHandwritingDelegatePackage(intent.getPackage());
		}

		/** Start the search activity. */
		private static void startSearchActivity(
		Context context, FragmentActivity activity, int pageId, Intent intent) {
		FeatureFactory.getFactory(context).getSlicesFeatureProvider()
		.indexSliceDataAsync(context);

		@@ -135,7 +144,6 @@ public interface SearchFeatureProvider {

		final Bundle bundle = ActivityOptions.makeSceneTransitionAnimation(activity).toBundle();
		activity.startActivity(intent, bundle);
		});
		}

		Intent buildSearchIntent(Context context, int pageId);