From b7c0bc8e481f1ec55066c2d7c13dc2480a950e3c Mon Sep 17 00:00:00 2001 From: nyyu Date: Sat, 10 Dec 2022 18:25:28 +0100 Subject: [PATCH] Revert "fix: flipflap QPR1 merge" This reverts commit d31c589001c1d739a041a9e5223fcd35b6a6ee82. --- FliFlap-Fix-compilation-for-QPR1-merge.patch | 25 -------------------- sync.sh | 3 --- 2 files changed, 28 deletions(-) delete mode 100644 FliFlap-Fix-compilation-for-QPR1-merge.patch diff --git a/FliFlap-Fix-compilation-for-QPR1-merge.patch b/FliFlap-Fix-compilation-for-QPR1-merge.patch deleted file mode 100644 index 2b36b0d..0000000 --- a/FliFlap-Fix-compilation-for-QPR1-merge.patch +++ /dev/null @@ -1,25 +0,0 @@ -From f6816d8d7f8ec51854f65a26b68b53b2a70a0c75 Mon Sep 17 00:00:00 2001 -From: nyyu -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 \ No newline at end of file diff --git a/sync.sh b/sync.sh index 2cf296f..6dbebce 100644 --- a/sync.sh +++ b/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