Merge branch 'epic211-a16-qpr0' into 'a16' (9b70b218) · Commits · e / os / BlissLauncher3

.gitattributes

0 → 100644

+1 −0

Original line number	Original line	Diff line number	Diff line
			* text=auto eol=lf
			No newline at end of file

.gitignore

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -11,7 +11,8 @@ bin/
	.idea/		.idea/
	.gradle/		.gradle/
	local.properties		local.properties
	gradle/
	build/		build/
	gradlew*
	.DS_Store		.DS_Store
			libs/Launcher3QuickStepLib.jar
			blissWithQuickstep
			blissWithoutQuickstep

.gitlab-ci.yml

0 → 100644

+128 −0

Original line number	Original line	Diff line number	Diff line
			image: "registry.gitlab.e.foundation/e/os/docker-android-apps-cicd:latest"

			variables:
			APK_PATH: "build/outputs/apk/blissWithQuickstep/release"
			UNSIGNED_APK: "BlissLauncher-a15-release.apk"
			COMMUNITY_APK: "BlissLauncher-a15-community.apk"
			OFFICIAL_APK: "BlissLauncher-a15-official.apk"
			TEST_APK: "BlissLauncher-a15-test.apk"

			stages:
			- build
			- gitlab_release

			before_script:
			- export JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
			- export GRADLE_USER_HOME=$(pwd)/.gradle
			- chmod +x ./gradlew
			- git submodule update --init --recursive

			cache:
			key: ${CI_PROJECT_ID}
			paths:
			- .gradle/

			blissWithQuickstepDebug:
			stage: build
			script:
			- ./gradlew assembleblissWithQuickstepDebug
			artifacts:
			paths:
			- build/outputs/apk

			blissWithQuickstepRelease:
			stage: build
			script:
			- ./gradlew assembleblissWithQuickstepRelease
			artifacts:
			paths:
			- build/outputs/apk

			init_submodules:
			stage: gitlab_release
			rules:
			- if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
			when: on_success
			script:
			- git clone https://gitlab.e.foundation/e/os/system-apps-update-info.git systemAppsUpdateInfo
			artifacts:
			paths:
			- systemAppsUpdateInfo/scripts/

			generate-apks:
			stage: gitlab_release
			rules:
			- if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
			when: on_success
			needs:
			- init_submodules
			- blissWithQuickstepRelease
			dependencies:
			- init_submodules
			- blissWithQuickstepRelease
			script:
			- \|
			./systemAppsUpdateInfo/scripts/generate-apks.sh \
			"$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK" "$TEST_APK"
			artifacts:
			paths:
			- $APK_PATH/$UNSIGNED_APK
			- $APK_PATH/$COMMUNITY_APK
			- $APK_PATH/$OFFICIAL_APK
			- $APK_PATH/$TEST_APK

			create-json-files:
			stage: gitlab_release
			dependencies:
			- init_submodules
			- generate-apks
			needs:
			- init_submodules
			- generate-apks
			rules:
			- if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
			when: on_success
			script:
			- \|
			./systemAppsUpdateInfo/scripts/create-json-files.sh \
			"$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK" "$TEST_APK"
			artifacts:
			paths:
			- community.json
			- official.json
			- test.json

			create-test-release:
			stage: gitlab_release
			dependencies:
			- init_submodules
			needs:
			- init_submodules
			- create-json-files
			- generate-apks
			rules:
			- if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
			when: manual
			script:
			- \|
			./systemAppsUpdateInfo/scripts/create-test-release.sh \
			"$APK_PATH" "$TEST_APK"
			allow_failure: true


			create-release:
			stage: gitlab_release
			dependencies:
			- init_submodules
			needs:
			- init_submodules
			- create-json-files
			- generate-apks
			rules:
			- if: '$CI_COMMIT_TAG && $CI_COMMIT_REF_PROTECTED == "true"'
			when: manual
			script:
			- \|
			./systemAppsUpdateInfo/scripts/create-release.sh \
			"$APK_PATH" "$UNSIGNED_APK" "$COMMUNITY_APK" "$OFFICIAL_APK"
			allow_failure: true

.gitmodules

0 → 100644

+4 −0

Original line number	Original line	Diff line number	Diff line
			[submodule "libs_systemui"]
			path = libs_systemui
			url = https://gitlab.e.foundation/e/os/android_frameworks_libs_systemui
			branch = a16

Android.bp

+73 −15

Original line number	Original line	Diff line number	Diff line
	@@ -38,6 +38,8 @@ java_defaults {
	filegroup {		filegroup {
	name: "launcher-src",		name: "launcher-src",
	srcs: [		srcs: [
			"bliss/src/*/.java",
			"bliss/src/*/.kt",
	"src/*/.java",		"src/*/.java",
	"src/*/.kt",		"src/*/.kt",
	],		],
	@@ -364,13 +366,6 @@ java_library {
	min_sdk_version: min_launcher3_sdk_version,		min_sdk_version: min_launcher3_sdk_version,
	}		}

	java_import {
	name: "libGoogleFeed",
	jars: [
	"libs/libGoogleFeed.jar",
	],
	}

	// Library with all the dependencies for building Launcher3		// Library with all the dependencies for building Launcher3
	android_library {		android_library {
	name: "Launcher3ResLib",		name: "Launcher3ResLib",
	@@ -378,7 +373,13 @@ android_library {
	"launcher_compose_defaults",		"launcher_compose_defaults",
	],		],
	srcs: [],		srcs: [],
	resource_dirs: ["res"],		resource_dirs: [
			"bliss/res",
			"res",
			],
			kotlin_plugins: [
			"kotlin-serialize-compiler-plugin",
			],
	static_libs: [		static_libs: [
	"LauncherPluginLib",		"LauncherPluginLib",
	"launcher_quickstep_log_protos_lite",		"launcher_quickstep_log_protos_lite",
	@@ -404,13 +405,26 @@ android_library {
	"androidx.lifecycle_lifecycle-runtime-ktx",		"androidx.lifecycle_lifecycle-runtime-ktx",
	"kotlinx_coroutines_android",		"kotlinx_coroutines_android",
	"kotlinx_coroutines",		"kotlinx_coroutines",
			"kotlinx_serialization_json",
	"com_android_launcher3_flags_lib",		"com_android_launcher3_flags_lib",
	"com_android_wm_shell_flags_lib",		"com_android_wm_shell_flags_lib",
	"dagger2",		"dagger2",
	"jsr330",		"jsr330",
	"com_android_systemui_shared_flags_lib",		"com_android_systemui_shared_flags_lib",
	"libGoogleFeed",
	"org.lineageos.platform",		"org.lineageos.platform",
			"elib",
			"e-telemetry",
			"hoko-blur-1.5.5",
			"logging-interceptor-5.3.0",
			"okhttp-jvm-5.3.0",
			"rxjava",
			"sentry-8.16.0",
			"sentry-android-core-release",
			"sentry-android-release",
			"sentry-android-timber-release",
			"sentry-android-ndk-8.16.0",
			"sentry-native-ndk-0.8.4",
			"timber-5.0.1",
	],		],
	manifest: "AndroidManifest-common.xml",		manifest: "AndroidManifest-common.xml",
	sdk_version: "current",		sdk_version: "current",
	@@ -423,6 +437,14 @@ android_library {
	],		],
	}		}

			prebuilt_etc {
			name: "privapp_whitelist_foundation.e.blisslauncher",
			system_ext_specific: true,
			sub_dir: "permissions",
			src: "foundation.e.blisslauncher.xml",
			filename_from_src: true,
			}

	// Extra privileged permission whitelist for Launcher3 app.		// Extra privileged permission whitelist for Launcher3 app.
	prebuilt_etc {		prebuilt_etc {
	name: "privapp_whitelist_com.android.launcher3-extra",		name: "privapp_whitelist_com.android.launcher3-extra",
	@@ -591,7 +613,7 @@ android_library {

	// Build rule for Quickstep app.		// Build rule for Quickstep app.
	android_app {		android_app {
	name: "Launcher3QuickStep",		name: "BlissLauncher3",
	static_libs: ["Launcher3QuickStepLib"],		static_libs: ["Launcher3QuickStepLib"],
	optimize: {		optimize: {
	proguard_flags_files: [":launcher-proguard-rules"],		proguard_flags_files: [":launcher-proguard-rules"],
	@@ -599,9 +621,11 @@ android_app {
	shrink_resources: true,		shrink_resources: true,
	},		},

			certificate: "platform",
	platform_apis: true,		platform_apis: true,
	min_sdk_version: "current",		min_sdk_version: "current",
	target_sdk_version: "current",		target_sdk_version: "current",
			use_embedded_native_libs: true,

	privileged: true,		privileged: true,
	system_ext_specific: true,		system_ext_specific: true,
	@@ -610,20 +634,29 @@ android_app {
	"Launcher2",		"Launcher2",
	"Launcher3",		"Launcher3",
	"QuickSearchBox",		"QuickSearchBox",
			"Launcher3QuickStep",
	],		],
	required: [		required: [
	"privapp_whitelist_com.android.launcher3",		"privapp_whitelist_foundation.e.blisslauncher",
	"privapp_whitelist_com.android.launcher3-extra",
	"launcher.quickstep.protolog.pb",		"launcher.quickstep.protolog.pb",
	],		],

	resource_dirs: ["quickstep/res"],		resource_dirs: ["quickstep/res"],

	additional_manifests: [		additional_manifests: [
			"bliss/AndroidManifest.xml",
	"quickstep/AndroidManifest-launcher.xml",		"quickstep/AndroidManifest-launcher.xml",
	"AndroidManifest-common.xml",		"AndroidManifest-common.xml",
	],		],

			aaptflags: [
			"--rename-manifest-package foundation.e.blisslauncher",
			"--version-name",
			"3.1.2",
			"--version-code",
			"3010020",
			],

	manifest: "quickstep/AndroidManifest.xml",		manifest: "quickstep/AndroidManifest.xml",
	jacoco: {		jacoco: {
	include_filter: ["com.android.launcher3.*"],		include_filter: ["com.android.launcher3.*"],
	@@ -631,6 +664,20 @@ android_app {

	}		}

			phony {
			name: "Launcher3QuickStep",
			required: [
			"BlissLauncher3",
			],
			}

			phony {
			name: "Launcher3QuickStepGo",
			required: [
			"BlissLauncher3Go",
			],
			}

	// Build rule for Launcher3 Go app with quickstep for Android Go devices.		// Build rule for Launcher3 Go app with quickstep for Android Go devices.
	// Note that the following two rules are exactly same, and should		// Note that the following two rules are exactly same, and should
	// eventually be merged into a single target		// eventually be merged into a single target
	@@ -676,13 +723,15 @@ android_app {
	}		}

	android_app {		android_app {
	name: "Launcher3QuickStepGo",		name: "BlissLauncher3Go",
	static_libs: ["Launcher3GoLib"],		static_libs: ["Launcher3GoLib"],
	resource_dirs: [],		resource_dirs: [],

			certificate: "platform",
	platform_apis: true,		platform_apis: true,
	min_sdk_version: "current",		min_sdk_version: "current",
	target_sdk_version: "current",		target_sdk_version: "current",
			use_embedded_native_libs: true,

	optimize: {		optimize: {
	proguard_flags_files: ["proguard.flags"],		proguard_flags_files: ["proguard.flags"],
	@@ -697,19 +746,28 @@ android_app {
	"Launcher2",		"Launcher2",
	"Launcher3",		"Launcher3",
	"Launcher3QuickStep",		"Launcher3QuickStep",
			"Launcher3QuickStepGo",
	"QuickSearchBox",		"QuickSearchBox",
	],		],
	required: [		required: [
	"privapp_whitelist_com.android.launcher3",		"privapp_whitelist_foundation.e.blisslauncher",
	"privapp_whitelist_com.android.launcher3-extra",
	],		],

	additional_manifests: [		additional_manifests: [
			"bliss/AndroidManifest.xml",
	"go/AndroidManifest.xml",		"go/AndroidManifest.xml",
	"go/AndroidManifest-launcher.xml",		"go/AndroidManifest-launcher.xml",
	"AndroidManifest-common.xml",		"AndroidManifest-common.xml",
	],		],

			aaptflags: [
			"--rename-manifest-package foundation.e.blisslauncher",
			"--version-name",
			"3.1.2",
			"--version-code",
			"3010020",
			],

	manifest: "quickstep/AndroidManifest.xml",		manifest: "quickstep/AndroidManifest.xml",
	jacoco: {		jacoco: {
	include_filter: ["com.android.launcher3.*"],		include_filter: ["com.android.launcher3.*"],