Snap for 12385180 from 566c1c628ed65bfe0f5177a41775a8d5c23ca34e to 24Q4-release (dbf943b8) · Commits · e / os / android_frameworks_libs_systemui

iconloaderlib/Android.bp

+5 −0

Original line number	Diff line number	Diff line
		@@ -22,12 +22,14 @@ android_library {
		min_sdk_version: "26",
		static_libs: [
		"androidx.core_core",
		"com_android_launcher3_flags_lib",
		],
		resource_dirs: [
		"res",
		],
		srcs: [
		"src/*/.java",
		"src/*/.kt",
		],
		}

		@@ -37,13 +39,16 @@ android_library {
		min_sdk_version: "26",
		static_libs: [
		"androidx.core_core",
		"com_android_launcher3_flags_lib",
		],
		resource_dirs: [
		"res",
		],
		srcs: [
		"src/*/.java",
		"src/*/.kt",
		"src_full_lib/*/.java",
		"src_full_lib/*/.kt",
		],
		apex_available: [
		"//apex_available:platform",

deleted100644 → 0

+0 −25

Original line number	Diff line number	Diff line
		plugins {
		id 'com.android.library'
		}

		android {
		namespace = "com.android.launcher3.icons"
		sourceSets {
		main {
		java.srcDirs = ['src', 'src_full_lib']
		manifest.srcFile 'AndroidManifest.xml'
		res.srcDirs = ['res']
		}
		}
		lint {
		abortOnError false
		}

		tasks.withType(JavaCompile) {
		options.compilerArgs << "-Xlint:unchecked" << "-Xlint:deprecation"
		}
		}

		dependencies {
		implementation "androidx.core:core"
		}

0 → 100644

+20 −0

Original line number	Diff line number	Diff line
		plugins {
		id(libs.plugins.android.library.get().pluginId)
		id(libs.plugins.kotlin.android.get().pluginId)
		}

		android {
		namespace = "com.android.launcher3.icons"
		sourceSets {
		named("main") {
		java.setSrcDirs(listOf("src", "src_full_lib"))
		manifest.srcFile("AndroidManifest.xml")
		res.setSrcDirs(listOf("res"))
		}
		}
		}

		dependencies {
		implementation("androidx.core:core")
		api(project(":NexusLauncher.Flags"))
		}

+1 −1

Original line number	Diff line number	Diff line
		@@ -374,7 +374,7 @@ public class BaseIconFactory implements AutoCloseable {
		}

		@NonNull
		protected Bitmap createIconBitmap(@Nullable final Drawable icon, final float scale) {
		public Bitmap createIconBitmap(@Nullable final Drawable icon, final float scale) {
		return createIconBitmap(icon, scale, MODE_DEFAULT);
		}

+7 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import com.google.android.msdl.data.model.MSDLToken
		import com.google.android.msdl.data.repository.MSDLRepository
		import com.google.android.msdl.data.repository.MSDLRepositoryImpl
		import com.google.android.msdl.domain.MSDLPlayerImpl.Companion.REQUIRED_PRIMITIVES
		import com.google.android.msdl.logging.MSDLEvent
		import java.util.concurrent.Executor
		import java.util.concurrent.Executors

		@@ -51,6 +52,12 @@ interface MSDLPlayer {
		*/
		fun playToken(token: MSDLToken, properties: InteractionProperties? = null)

		/**
		* Get the history of recent [MSDLEvent]s. The list can be useful to include in loggers and
		* system dumps for debugging purposes.
		*/
		fun getHistory(): List<MSDLEvent>

		companion object {

		// TODO(b/355230334): remove once we have a system setting for the level