Merge branch 'lineage-21.0' of https://github.com/LineageOS/android_packages_apps_Glimpse into leaf-3.2
Change-Id: I1808b686058b6c020da4fb62a940fed5faa79a3e
diff --git a/app/Android.bp b/app/Android.bp
index d35edef..816036b 100644
--- a/app/Android.bp
+++ b/app/Android.bp
@@ -59,4 +59,9 @@
optimize: {
proguard_flags_files: ["proguard-rules.pro"],
},
+
+ aaptflags: [
+ "--rename-manifest-package",
+ "org.leafos.glimpse",
+ ],
}
diff --git a/rro_overlays/GlimpseFrameworksBaseOverlay/AndroidManifest.xml b/rro_overlays/GlimpseFrameworksBaseOverlay/AndroidManifest.xml
index fa7d559..2126c3c 100644
--- a/rro_overlays/GlimpseFrameworksBaseOverlay/AndroidManifest.xml
+++ b/rro_overlays/GlimpseFrameworksBaseOverlay/AndroidManifest.xml
@@ -4,7 +4,7 @@
SPDX-License-Identifier: Apache-2.0
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="org.lineageos.glimpse.frameworksbaseoverlay"
+ package="org.leafos.glimpse.frameworksbaseoverlay"
android:versionCode="1"
android:versionName="1.0">
diff --git a/rro_overlays/GlimpseFrameworksBaseOverlay/res/values/config.xml b/rro_overlays/GlimpseFrameworksBaseOverlay/res/values/config.xml
index 1327c52..2e79b0c 100644
--- a/rro_overlays/GlimpseFrameworksBaseOverlay/res/values/config.xml
+++ b/rro_overlays/GlimpseFrameworksBaseOverlay/res/values/config.xml
@@ -5,5 +5,5 @@
-->
<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
<!-- The name of the package that will hold the system gallery role. -->
- <string name="config_systemGallery" translatable="false">org.lineageos.glimpse</string>
+ <string name="config_systemGallery" translatable="false">org.leafos.glimpse</string>
</resources>