Merge "Migrate Bubbles to wm-shell (5/n)" (ae7e2fb0) · Commits · e / os / android_frameworks_base

core/java/com/android/internal/inputmethod/SoftInputShowHideReason.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -144,7 +144,7 @@ public @interface SoftInputShowHideReason {
		int HIDE_RECENTS_ANIMATION = 18;

		/**
		* Hide soft input when {@link com.android.systemui.bubbles.BubbleController} is expanding,
		* Hide soft input when {@link com.android.wm.shell.bubbles.BubbleController} is expanding,
		* switching, or collapsing Bubbles.
		*/
		int HIDE_BUBBLES = 19;

+4 −1

Original line number	Diff line number	Diff line
		@@ -116,12 +116,15 @@ android_library {
		"res",
		],
		static_libs: [
		"androidx.appcompat_appcompat",
		"androidx.arch.core_core-runtime",
		"androidx.dynamicanimation_dynamicanimation",
		"kotlinx-coroutines-android",
		"kotlinx-coroutines-core",
		"iconloader_base",
		"protolog-lib",
		"SettingsLib",
		"WindowManager-Shell-proto",
		"androidx.appcompat_appcompat",
		],
		kotlincflags: ["-Xjvm-default=enable"],
		manifest: "AndroidManifest.xml",

+28 −0

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2019 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		~ Copyright (C) 2020 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License.
		-->
		<!--
		The transparent circle outline that encircles the bubbles when they're in the dismiss target.

+14 −14

Original line number	Diff line number	Diff line
		<!--
		Copyright (C) 2019 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		~ Copyright (C) 2020 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License.
		-->
		<!-- The 'X' bubble dismiss icon. This is just ic_close with a stroke. -->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"

+25 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright (C) 2019 The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		~ Copyright (C) 2020 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License.
		-->
		<vector xmlns:android="http://schemas.android.com/apk/res/android"
		android:width="20dp"