Snap for 9535926 from 83ba46a95648f47dd102638a0dd49e9559a1f743 to tm-qpr3-release
Change-Id: If568d301c78089af9b64530b1e5c642b047692c8
diff --git a/current/aaos-libs/Android.bp b/current/aaos-libs/Android.bp
index 5b1f8e2..61753b9 100644
--- a/current/aaos-libs/Android.bp
+++ b/current/aaos-libs/Android.bp
@@ -223,6 +223,47 @@
],
}
+android_library {
+ name: "car-ui-lib-no-overlayable",
+ min_sdk_version: "28",
+ target_sdk_version: "30",
+ sdk_version: "31",
+ static_libs:[
+ "car-ui-lib-source-no-overlayable",
+ "androidx.annotation_annotation",
+ "androidx.appcompat_appcompat",
+ "androidx-constraintlayout_constraintlayout",
+ "androidx.preference_preference",
+ "androidx.recyclerview_recyclerview",
+ "androidx-constraintlayout_constraintlayout-solver",
+ "androidx.asynclayoutinflater_asynclayoutinflater",
+ ],
+ apex_available: [
+ "com.android.permission",
+ "//apex_available:platform",
+ ],
+}
+
+android_library_import {
+ name: "car-ui-lib-source-no-overlayable",
+ aars: ["car-ui-lib-no-overlayable.aar"],
+ min_sdk_version: "28",
+ sdk_version: "31",
+ static_libs:[
+ "androidx.annotation_annotation",
+ "androidx.appcompat_appcompat",
+ "androidx-constraintlayout_constraintlayout",
+ "androidx.preference_preference",
+ "androidx.recyclerview_recyclerview",
+ "androidx-constraintlayout_constraintlayout-solver",
+ "androidx.asynclayoutinflater_asynclayoutinflater",
+ ],
+ apex_available: [
+ "com.android.permission",
+ "//apex_available:platform",
+ ],
+}
+
java_import {
name: "car-ui-lib-oem-apis-source",
jars: ["car-ui-lib-oem-apis.jar"],
diff --git a/current/aaos-libs/car-ui-lib-no-overlayable.aar b/current/aaos-libs/car-ui-lib-no-overlayable.aar
new file mode 100644
index 0000000..daf14c2
--- /dev/null
+++ b/current/aaos-libs/car-ui-lib-no-overlayable.aar
Binary files differ
diff --git a/current/aaos-libs/update_prebuilts.sh b/current/aaos-libs/update_prebuilts.sh
index 1738bca..c3ef971 100755
--- a/current/aaos-libs/update_prebuilts.sh
+++ b/current/aaos-libs/update_prebuilts.sh
@@ -48,6 +48,8 @@
downloadApp $1 "car-uxr-client-lib.aar" "car-uxr-client-lib.aar" $BUILD_TARGET
echo "Downloading car-ui-lib-testing-support.aar"
downloadApp $1 "car-ui-lib-testing-support.aar" "car-ui-lib-testing-support.aar" "car_apps-user"
+ echo "Downloading car-ui-lib-no-overlayable.aar"
+ downloadApp $1 "car-ui-lib-no-overlayable.aar" "car-ui-lib-no-overlayable.aar" "car_apps-user"
;;
car-apps-common)
echo "Downloading car-apps-common"
@@ -82,6 +84,9 @@
# TODO(b/258809109): car-ui-lib-testing-support doesn't have a gradle target yet.
echo "Downloading car-ui-lib-testing-support.aar"
downloadApp $1 "car-ui-lib-testing-support.aar" "car-ui-lib-testing-support.aar" "car_apps-user"
+ # TODO(b/258809109): car-ui-lib-no-overlayable doesn't have a gradle target yet.
+ echo "Downloading car-ui-lib-no-overlayable.aar"
+ downloadApp $1 "car-ui-lib-no-overlayable.aar" "car-ui-lib-no-overlayable.aar" "car_apps-user"
;;
*)
echo "Invalid application option {all|car-apps-common|car-assist-lib|car-media-common|car-messaging-models|car-uxr-client-lib|car-telephony-common|car-ui-lib}"