From b1f77cb554c4cbaf669bd21c24598a3ebb3d9d5c Mon Sep 17 00:00:00 2001
From: Michael Bestas <mkbestas@lineageos.org>
Date: Mon, 10 Jan 2022 01:35:31 +0200
Subject: [PATCH] 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
---
 default.xml          | 1 -
 snippets/lineage.xml | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/default.xml b/default.xml
index 78e97999..23f74471 100644
--- a/default.xml
+++ b/default.xml
@@ -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" />
diff --git a/snippets/lineage.xml b/snippets/lineage.xml
index f5246560..6cd770d3 100644
--- a/snippets/lineage.xml
+++ b/snippets/lineage.xml
@@ -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" />