Revert "fix: flipflap QPR1 merge"

This reverts commit d31c589001.

FliFlap-Fix-compilation-for-QPR1-merge.patch

@@ -1,25 +0,0 @@
-From f6816d8d7f8ec51854f65a26b68b53b2a70a0c75 Mon Sep 17 00:00:00 2001
-From: nyyu <mail@nyyu.dev>
-Date: Sat, 10 Dec 2022 12:30:53 +0100
-Subject: [PATCH] FliFlap: Fix compilation for QPR1 merge
-
-Change-Id: I22f27c43942ce606226062b89d9b7497b8d4498b
----
- src/org/lineageos/flipflap/FlipFlapSettingsActivity.java | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/org/lineageos/flipflap/FlipFlapSettingsActivity.java b/src/org/lineageos/flipflap/FlipFlapSettingsActivity.java
-index af25745..e20b1a5 100644
---- a/src/org/lineageos/flipflap/FlipFlapSettingsActivity.java
-+++ b/src/org/lineageos/flipflap/FlipFlapSettingsActivity.java
-@@ -23,7 +23,7 @@ package org.lineageos.flipflap;
- import android.os.Bundle;
-
- import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity;
--import com.android.settingslib.collapsingtoolbar.R;
-+import com.android.settingslib.widget.R;
-
- public class FlipFlapSettingsActivity extends CollapsingToolbarBaseActivity {
-
---
-2.38.1

sync.sh

@@ -46,9 +46,6 @@ cd $TOPDIR
 cd packages/apps/Trebuchet
 git am $CI_WORKSPACE/fix-enable-more-grids-for-tablet.patch || git am --abort
 cd $TOPDIR
-cd packages/apps/FlipFlap
-git am $CI_WORKSPACE/FliFlap-Fix-compilation-for-QPR1-merge.patch || git am --abort
-cd $TOPDIR
 
 #bluetooth
 cd packages/modules/Bluetooth