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

Commit b2600490 authored Feb 14, 2023 by Becky Qiu Committed by Automerger Merge Worker Feb 14, 2023

Merge "[Toast] Add an extra field for trampoline activity." into tm-qpr-dev am: be1ad7b3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/libs/systemui/+/21360797

Change-Id: I20da8a0f7a26190f2bcd77bbdff4568f21439244
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents d80b89b7 be1ad7b3

searchuilib/src/com/android/app/search/SearchActionExtras.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -34,5 +34,8 @@ public class SearchActionExtras {
		public static final String BUNDLE_EXTRA_SHOULD_START_FOR_RESULT = "should_start_for_result";
		public static final String BUNDLE_EXTRA_SUGGEST_OPEN_DEFAULT_BROWSER =
		"suggest_open_default_browser";

		public static final String BUNDLE_EXTRA_TRAMPOLINE_ACTIVITY_ENABLED =
		"trampoline_activity_enabled";
		public static final String BUNDLE_EXTRA_SUGGESTION_ACTION_TEXT = "suggestion_action_text";
		public static final String BUNDLE_EXTRA_SUGGESTION_ACTION_RPC = "suggestion_action_rpc";
		}

searchuilib/src/com/android/app/search/SearchTargetExtras.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -116,8 +116,6 @@ public class SearchTargetExtras {
		*/
		public static final String BUNDLE_EXTRA_SHOULD_FILL_CONTAINER_WIDTH =
		"should_fill_container_width";
		public static final String BUNDLE_EXTRA_SUGGESTION_ACTION_TEXT = "suggestion_action_text";
		public static final String BUNDLE_EXTRA_SUGGESTION_ACTION_RPC = "suggestion_action_rpc";
		public static final String BUNDLE_EXTRA_SUPPORT_QUERY_BUILDER = "support_query_builder";
		public static final String BUNDLE_EXTRA_SUGGEST_RAW_TEXT = "suggest_raw_text";
		public static final String BUNDLE_EXTRA_SUGGEST_TRUNCATE_START = "suggest_truncate_start";