Merge "3/3 Move some Shell utils to the Shared package." into main (ee215211) · Commits · e / os / android_frameworks_base

libs/WindowManager/Shell/Android.bp

+2 −12

Original line number	Diff line number	Diff line
		@@ -39,17 +39,6 @@ filegroup {
		path: "src",
		}

		// Sources that have no dependencies that can be used directly downstream of this library
		// TODO(b/322791067): move these sources to WindowManager-Shell-shared
		filegroup {
		name: "wm_shell_util-sources",
		srcs: [
		"src/com/android/wm/shell/common/bubbles/*.kt",
		"src/com/android/wm/shell/common/bubbles/*.java",
		],
		path: "src",
		}

		// Aidls which can be used directly downstream of this library
		filegroup {
		name: "wm_shell-aidls",
		@@ -184,9 +173,11 @@ java_library {
		":wm_shell-shared-aidls",
		],
		static_libs: [
		"androidx.core_core-animation",
		"androidx.dynamicanimation_dynamicanimation",
		"jsr330",
		],
		kotlincflags: ["-Xjvm-default=all"],
		}

		java_library {
		@@ -212,7 +203,6 @@ android_library {
		],
		static_libs: [
		"androidx.appcompat_appcompat",
		"androidx.core_core-animation",
		"androidx.core_core-ktx",
		"androidx.arch.core_core-runtime",
		"androidx.datastore_datastore",

+1 −1

Original line number	Diff line number	Diff line
		@@ -16,7 +16,7 @@
		package com.android.wm.shell.bubbles

		import android.view.LayoutInflater
		import com.android.wm.shell.common.bubbles.BubblePopupView
		import com.android.wm.shell.shared.bubbles.BubblePopupView
		import com.android.wm.shell.testing.goldenpathmanager.WMShellGoldenPathManager
		import com.android.wm.shell.R
		import org.junit.Rule

+1 −1

Original line number	Diff line number	Diff line
		@@ -30,7 +30,7 @@ import androidx.test.filters.SmallTest
		import com.android.internal.protolog.ProtoLog
		import com.android.wm.shell.R
		import com.android.wm.shell.bubbles.BubblePositioner.MAX_HEIGHT
		import com.android.wm.shell.common.bubbles.BubbleBarLocation
		import com.android.wm.shell.shared.bubbles.BubbleBarLocation
		import com.google.common.truth.Truth.assertThat
		import com.google.common.util.concurrent.MoreExecutors.directExecutor
		import org.junit.Before

+1 −1

Original line number	Diff line number	Diff line
		@@ -53,7 +53,7 @@ import org.junit.runner.RunWith
		import org.mockito.kotlin.mock
		import android.platform.test.annotations.DisableFlags
		import android.platform.test.annotations.EnableFlags
		import com.android.wm.shell.common.bubbles.BubbleBarLocation
		import com.android.wm.shell.shared.bubbles.BubbleBarLocation
		import java.util.concurrent.Semaphore
		import java.util.concurrent.TimeUnit
		import java.util.function.Consumer

+6 −6

Original line number	Diff line number	Diff line
		@@ -31,12 +31,12 @@ import com.android.internal.protolog.ProtoLog
		import com.android.wm.shell.R
		import com.android.wm.shell.bubbles.BubblePositioner
		import com.android.wm.shell.bubbles.DeviceConfig
		import com.android.wm.shell.common.bubbles.BaseBubblePinController
		import com.android.wm.shell.common.bubbles.BaseBubblePinController.Companion.DROP_TARGET_ALPHA_IN_DURATION
		import com.android.wm.shell.common.bubbles.BaseBubblePinController.Companion.DROP_TARGET_ALPHA_OUT_DURATION
		import com.android.wm.shell.common.bubbles.BubbleBarLocation
		import com.android.wm.shell.common.bubbles.BubbleBarLocation.LEFT
		import com.android.wm.shell.common.bubbles.BubbleBarLocation.RIGHT
		import com.android.wm.shell.shared.bubbles.BaseBubblePinController
		import com.android.wm.shell.shared.bubbles.BaseBubblePinController.Companion.DROP_TARGET_ALPHA_IN_DURATION
		import com.android.wm.shell.shared.bubbles.BaseBubblePinController.Companion.DROP_TARGET_ALPHA_OUT_DURATION
		import com.android.wm.shell.shared.bubbles.BubbleBarLocation
		import com.android.wm.shell.shared.bubbles.BubbleBarLocation.LEFT
		import com.android.wm.shell.shared.bubbles.BubbleBarLocation.RIGHT
		import com.google.common.truth.Truth.assertThat
		import org.junit.After
		import org.junit.Before