fix: patches

fix-enable-more-grids-for-tablet.patch

@@ -14,7 +14,7 @@ index 8105afaa24..eef99d49bb 100644
 +++ b/res/xml/device_profiles.xml
 @@ -103,7 +103,7 @@
          launcher:dbFile="launcher_4_by_5.db"
-         launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_4_5"
+         launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_split"
          launcher:defaultLayoutId="@xml/default_workspace_4x5"
 -        launcher:deviceCategory="phone|multi_display" >
 +        launcher:deviceCategory="phone|tablet|multi_display" >
@@ -23,7 +23,7 @@ index 8105afaa24..eef99d49bb 100644
              launcher:name="Short Stubby"
 @@ -167,7 +167,7 @@
          launcher:dbFile="launcher.db"
-         launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_5_5"
+         launcher:inlineNavButtonsEndSpacing="@dimen/taskbar_button_margin_split"
          launcher:defaultLayoutId="@xml/default_workspace_5x5"
 -        launcher:deviceCategory="phone|multi_display" >
 +        launcher:deviceCategory="phone|tablet|multi_display" >

sync.sh

@@ -58,9 +58,9 @@ cd $TOPDIR
 
 #bluetooth
 cd packages/modules/Bluetooth
-git am $CI_WORKSPACE/fix-bt-1.patch || git am --abort
-git am $CI_WORKSPACE/fix-bt-2.patch || git am --abort
-git am $CI_WORKSPACE/fix-bt-3.patch || git am --abort
+#git am $CI_WORKSPACE/fix-bt-1.patch || git am --abort
+#git am $CI_WORKSPACE/fix-bt-2.patch || git am --abort
+#git am $CI_WORKSPACE/fix-bt-3.patch || git am --abort
 git am $CI_WORKSPACE/fix-bt-le.patch || git am --abort
 cd $TOPDIR