Merge "Move Pip codes from SysUI to WMShell lib (9/N)" (abd78597) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/Android.bp

+20 −1

Original line number	Original line	Diff line number	Diff line
	@@ -23,7 +23,18 @@ java_library {

	filegroup {		filegroup {
	name: "wm_shell-sources",		name: "wm_shell-sources",
	srcs: ["src/*/.java"],		srcs: [
			"src/*/.java",
			],
			path: "src",
			}

			// TODO(b/168581922) protologtool do not support kotlin(*.kt)
			filegroup {
			name: "wm_shell-sources-kt",
			srcs: [
			"src/*/.kt",
			],
	path: "src",		path: "src",
	}		}

	@@ -97,15 +108,23 @@ android_library {
	name: "WindowManager-Shell",		name: "WindowManager-Shell",
	srcs: [		srcs: [
	":wm_shell_protolog_src",		":wm_shell_protolog_src",
			// TODO(b/168581922) protologtool do not support kotlin(*.kt)
			":wm_shell-sources-kt",
	"src/*/I.aidl",		"src/*/I.aidl",
	],		],
	resource_dirs: [		resource_dirs: [
	"res",		"res",
	],		],
	static_libs: [		static_libs: [
			"androidx.dynamicanimation_dynamicanimation",
			"kotlinx-coroutines-android",
			"kotlinx-coroutines-core",
	"protolog-lib",		"protolog-lib",
	"WindowManager-Shell-proto",		"WindowManager-Shell-proto",
	"androidx.appcompat_appcompat",		"androidx.appcompat_appcompat",
	],		],
			kotlincflags: ["-Xjvm-default=enable"],
	manifest: "AndroidManifest.xml",		manifest: "AndroidManifest.xml",

			min_sdk_version: "26",
	}		}
			No newline at end of file

+0 −0

File moved.

+0 −0

File moved.

+0 −0

File moved.

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -14,7 +14,7 @@
	See the License for the specific language governing permissions and		See the License for the specific language governing permissions and
	limitations under the License.		limitations under the License.
	-->		-->
	<!-- Layout for {@link com.android.systemui.pip.tv.PipControlButtonView}. -->		<!-- Layout for {@link com.android.wm.shell.pip.tv.PipControlButtonView}. -->
	<merge xmlns:android="http://schemas.android.com/apk/res/android">		<merge xmlns:android="http://schemas.android.com/apk/res/android">

	<ImageView android:id="@+id/button"		<ImageView android:id="@+id/button"