Loading iconloaderlib/src/com/android/launcher3/util/UserIconInfo.java +1 −1 Original line number Diff line number Diff line Loading @@ -47,7 +47,7 @@ public class UserIconInfo { public final long userSerial; public UserIconInfo(UserHandle user, @UserType int type) { this(user, type, 0); this(user, type, user != null ? user.hashCode() : 0); } public UserIconInfo(UserHandle user, @UserType int type, long userSerial) { Loading tracinglib/Android.bp→tracinglib/core/Android.bp +6 −31 Original line number Diff line number Diff line // Copyright (C) 2023 The Android Open Source Project // Copyright (C) 2024 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. Loading @@ -23,7 +23,7 @@ java_library { "kotlinx_coroutines_android", "com_android_systemui_flags_lib", ], srcs: ["src/androidPlatformApi/kotlin/**/*.kt"], srcs: ["android/src-platform-api/**/*.kt"], } java_library { Loading @@ -34,7 +34,7 @@ java_library { "com_android_systemui_flags_lib", "androidx.tracing_tracing", ], srcs: ["src/androidMinApi19/kotlin/**/*.kt"], srcs: ["android/src-public-api/**/*.kt"], sdk_version: "31", min_sdk_version: "19", java_version: "17", Loading @@ -44,8 +44,8 @@ java_test_host { name: "tracinglib-host-test", defaults: ["tracinglib-defaults"], srcs: [ "src/fakeMain/kotlin/**/*.kt", "src/fakeTest/kotlin/**/*.kt", "host/src-fake/**/*.kt", "host/test/**/*.kt", ], static_libs: [ "kotlinx_coroutines", Loading @@ -56,34 +56,9 @@ java_test_host { ], } android_app { name: "TracingLibTestApp", platform_apis: true, manifest: "empty-manifest.xml", use_resource_processor: true, } android_robolectric_test { enabled: true, name: "tracinglib-robolectric-test", defaults: ["tracinglib-defaults"], srcs: ["src/androidRoboTest/kotlin/**/*.kt"], java_resource_dirs: ["test_config"], static_libs: [ "kotlinx_coroutines", "kotlinx_coroutines_test", ], libs: [ "androidx.test.core", "androidx.test.runner", ], instrumentation_for: "TracingLibTestApp", upstream: true, } java_defaults { name: "tracinglib-defaults", common_srcs: ["src/commonMain/kotlin/**/*.kt"], common_srcs: ["common/src/**/*.kt"], kotlincflags: [ "-Xjvm-default=all", "-Xmulti-platform", Loading tracinglib/src/androidPlatformApi/kotlin/com/android/app/tracing/TraceProxy.platform.kt→tracinglib/core/android/src-platform-api/TraceProxy.platform.kt +0 −0 File moved. View file tracinglib/src/androidPlatformApi/kotlin/com/android/app/tracing/TraceUtils.platform.kt→tracinglib/core/android/src-platform-api/TraceUtils.platform.kt +0 −0 File moved. View file tracinglib/src/androidMinApi19/kotlin/com/android/app/tracing/TraceProxy.jetpack.kt→tracinglib/core/android/src-public-api/src/TraceProxy.jetpack.kt +0 −0 File moved. View file Loading
iconloaderlib/src/com/android/launcher3/util/UserIconInfo.java +1 −1 Original line number Diff line number Diff line Loading @@ -47,7 +47,7 @@ public class UserIconInfo { public final long userSerial; public UserIconInfo(UserHandle user, @UserType int type) { this(user, type, 0); this(user, type, user != null ? user.hashCode() : 0); } public UserIconInfo(UserHandle user, @UserType int type, long userSerial) { Loading
tracinglib/Android.bp→tracinglib/core/Android.bp +6 −31 Original line number Diff line number Diff line // Copyright (C) 2023 The Android Open Source Project // Copyright (C) 2024 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. Loading @@ -23,7 +23,7 @@ java_library { "kotlinx_coroutines_android", "com_android_systemui_flags_lib", ], srcs: ["src/androidPlatformApi/kotlin/**/*.kt"], srcs: ["android/src-platform-api/**/*.kt"], } java_library { Loading @@ -34,7 +34,7 @@ java_library { "com_android_systemui_flags_lib", "androidx.tracing_tracing", ], srcs: ["src/androidMinApi19/kotlin/**/*.kt"], srcs: ["android/src-public-api/**/*.kt"], sdk_version: "31", min_sdk_version: "19", java_version: "17", Loading @@ -44,8 +44,8 @@ java_test_host { name: "tracinglib-host-test", defaults: ["tracinglib-defaults"], srcs: [ "src/fakeMain/kotlin/**/*.kt", "src/fakeTest/kotlin/**/*.kt", "host/src-fake/**/*.kt", "host/test/**/*.kt", ], static_libs: [ "kotlinx_coroutines", Loading @@ -56,34 +56,9 @@ java_test_host { ], } android_app { name: "TracingLibTestApp", platform_apis: true, manifest: "empty-manifest.xml", use_resource_processor: true, } android_robolectric_test { enabled: true, name: "tracinglib-robolectric-test", defaults: ["tracinglib-defaults"], srcs: ["src/androidRoboTest/kotlin/**/*.kt"], java_resource_dirs: ["test_config"], static_libs: [ "kotlinx_coroutines", "kotlinx_coroutines_test", ], libs: [ "androidx.test.core", "androidx.test.runner", ], instrumentation_for: "TracingLibTestApp", upstream: true, } java_defaults { name: "tracinglib-defaults", common_srcs: ["src/commonMain/kotlin/**/*.kt"], common_srcs: ["common/src/**/*.kt"], kotlincflags: [ "-Xjvm-default=all", "-Xmulti-platform", Loading
tracinglib/src/androidPlatformApi/kotlin/com/android/app/tracing/TraceProxy.platform.kt→tracinglib/core/android/src-platform-api/TraceProxy.platform.kt +0 −0 File moved. View file
tracinglib/src/androidPlatformApi/kotlin/com/android/app/tracing/TraceUtils.platform.kt→tracinglib/core/android/src-platform-api/TraceUtils.platform.kt +0 −0 File moved. View file
tracinglib/src/androidMinApi19/kotlin/com/android/app/tracing/TraceProxy.jetpack.kt→tracinglib/core/android/src-public-api/src/TraceProxy.jetpack.kt +0 −0 File moved. View file
