Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b1f77cb5 authored Jan 10, 2022 by Michael Bestas

Move DeskClock to lineage snippet

* We have now forked this app since we are using the android 11 version
  of it. This creates conflicts on monthly AOSP merges since the android
  12 version has been completely rewritten in kotlin. Let's move it to
  avoid unnecessary conflicts.

Change-Id: I5de5e5cab07b0703593f370ad087d466dd07d9f7

parent 81b07c77

default.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -794,7 +794,6 @@
		<project path="packages/apps/CellBroadcastReceiver" name="platform/packages/apps/CellBroadcastReceiver" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
		<project path="packages/apps/CertInstaller" name="platform/packages/apps/CertInstaller" groups="pdk-cw-fs,pdk-fs" remote="aosp" />
		<project path="packages/apps/Contacts" name="LineageOS/android_packages_apps_Contacts" groups="pdk-fs" />
		<project path="packages/apps/DeskClock" name="LineageOS/android_packages_apps_DeskClock" groups="pdk-fs" />
		<project path="packages/apps/Dialer" name="LineageOS/android_packages_apps_Dialer" groups="pdk-fs" />
		<project path="packages/apps/DocumentsUI" name="LineageOS/android_packages_apps_DocumentsUI" groups="pdk-cw-fs,pdk-fs" />
		<project path="packages/apps/EmergencyInfo" name="platform/packages/apps/EmergencyInfo" groups="pdk-fs" remote="aosp" />

snippets/lineage.xml

+1 −0

Original line number	Diff line number	Diff line
		@@ -26,6 +26,7 @@
		<project path="lineage-sdk" name="LineageOS/android_lineage-sdk" />
		<!--<project path="packages/apps/AudioFX" name="LineageOS/android_packages_apps_AudioFX" />-->
		<project path="packages/apps/Backgrounds" name="LineageOS/android_packages_apps_Backgrounds" />
		<project path="packages/apps/DeskClock" name="LineageOS/android_packages_apps_DeskClock" groups="pdk-fs" />
		<project path="packages/apps/Eleven" name="LineageOS/android_packages_apps_Eleven" />
		<!--<project path="packages/apps/Etar" name="LineageOS/android_packages_apps_Etar" />-->
		<project path="packages/apps/ExactCalculator" name="LineageOS/android_packages_apps_ExactCalculator" />