From 4174a4a849181dc9c21b0243dd310ed05f28911c Mon Sep 17 00:00:00 2001
From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
Date: Wed, 25 Mar 2020 10:29:46 +0800
Subject: [PATCH] Changes for March 2020

---
 ...ts-Invert-per-app-stretch-to-fullscreen.patch | 14 +++++++-------
 ..._soong-Disable-generated_kernel_headers.patch | 16 ++++++++++------
 ...-specify-config_wallpaperCropperPackage.patch |  8 ++++----
 3 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch b/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch
index db1c436..bce9b43 100644
--- a/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch
+++ b/0001-LineageParts-Invert-per-app-stretch-to-fullscreen.patch
@@ -1,4 +1,4 @@
-From 552e2f6d0ef9b72ade75ab5e0ba00a373a3a9468 Mon Sep 17 00:00:00 2001
+From 2da980250f13f6bec288b921be1ad6a57549b1fc Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Sun, 13 Jan 2019 21:44:48 +0800
 Subject: [PATCH] LineageParts: Invert per-app stretch-to-fullscreen
@@ -42,11 +42,11 @@ index b518ff4..6ca9adb 100644
      <string name="charging_sounds_enabled_title">启用</string>
      <string name="charging_sounds_enabled_summary">连接或断开电源时发出声音</string>
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 925c9ae..29854aa 100644
+index 418b478..2ae06e7 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
-@@ -589,9 +589,9 @@
-     <string name="expanded_desktop_nothing_to_show_text">Turn the switch off to customize your expanded desktop on a per-app basis</string>
+@@ -579,9 +579,9 @@
+     <string name="auto_power_save_never">Never</string>
  
      <!-- Applications: Long screen -->
 -    <string name="long_screen_settings_title">Full screen apps</string>
@@ -71,11 +71,11 @@ index ec947fa..20da90a 100644
  
  </PreferenceScreen>
 diff --git a/res/xml/parts_catalog.xml b/res/xml/parts_catalog.xml
-index 84beec1..9455bab 100644
+index a4346c7..e21d7d5 100644
 --- a/res/xml/parts_catalog.xml
 +++ b/res/xml/parts_catalog.xml
-@@ -98,8 +98,8 @@
-           lineage:xmlRes="@xml/expanded_desktop_prefs" />
+@@ -92,8 +92,8 @@
+           lineage:xmlRes="@xml/perf_profile_settings" />
  
      <part android:key="long_screen_settings"
 -          android:title="@string/long_screen_settings_title"
diff --git a/0001-build_soong-Disable-generated_kernel_headers.patch b/0001-build_soong-Disable-generated_kernel_headers.patch
index f40e9e6..5d11889 100644
--- a/0001-build_soong-Disable-generated_kernel_headers.patch
+++ b/0001-build_soong-Disable-generated_kernel_headers.patch
@@ -1,18 +1,18 @@
-From 07c0c3e6eb186a068835b114dbce98c9cfd77877 Mon Sep 17 00:00:00 2001
+From 61fdb30f08de01d6dee49168626de9da57d34700 Mon Sep 17 00:00:00 2001
 From: AndyCGYan <GeForce8800Ultra@gmail.com>
 Date: Sun, 3 Mar 2019 14:07:33 +0800
 Subject: [PATCH] build_soong: Disable generated_kernel_headers
 
 Change-Id: I630857cec208f1830e776bf5031d7bb9bc4435d0
 ---
- build/soong/Android.bp | 22 ----------------------
- 1 file changed, 22 deletions(-)
+ build/soong/Android.bp | 26 --------------------------
+ 1 file changed, 26 deletions(-)
 
 diff --git a/build/soong/Android.bp b/build/soong/Android.bp
-index 3e98349b..108c52f7 100644
+index cbea01f3..108c52f7 100644
 --- a/build/soong/Android.bp
 +++ b/build/soong/Android.bp
-@@ -22,25 +22,3 @@ bootstrap_go_package {
+@@ -22,29 +22,3 @@ bootstrap_go_package {
      ],
      pluginFor: ["soong_build"],
  }
@@ -24,7 +24,11 @@ index 3e98349b..108c52f7 100644
 -    cmd: "$(PATH_OVERRIDE_SOONG) $(KERNEL_MAKE_CMD) $(KERNEL_MAKE_FLAGS) -C $(TARGET_KERNEL_SOURCE) O=$(KERNEL_BUILD_OUT_PREFIX)$(genDir) ARCH=$(KERNEL_ARCH) $(KERNEL_CROSS_COMPILE) headers_install",
 -
 -    // Directories that can be imported by a cc_* module generated_headers property
--    export_include_dirs: ["usr/include", "usr/techpack/audio/include"],
+-    export_include_dirs: [
+-        "usr/include",
+-        "usr/include/audio/include/uapi",
+-        "usr/techpack/audio/include"
+-    ],
 -
 -    // Sources for dependency tracking
 -    dep_root: "$(TARGET_KERNEL_SOURCE)",
diff --git a/0001-treble-Don-t-specify-config_wallpaperCropperPackage.patch b/0001-treble-Don-t-specify-config_wallpaperCropperPackage.patch
index e2be227..b774d4e 100644
--- a/0001-treble-Don-t-specify-config_wallpaperCropperPackage.patch
+++ b/0001-treble-Don-t-specify-config_wallpaperCropperPackage.patch
@@ -1,4 +1,4 @@
-From 5180f2417b628e6f1611ce24fd54f711fbdbb991 Mon Sep 17 00:00:00 2001
+From 4d6f28cb695c5edf253f03c373485a21cd43d19c Mon Sep 17 00:00:00 2001
 From: Andy CrossGate Yan <GeForce8800Ultra@gmail.com>
 Date: Tue, 10 Sep 2019 02:42:36 +0000
 Subject: [PATCH] treble: Don't specify config_wallpaperCropperPackage
@@ -9,7 +9,7 @@ Change-Id: I72b59def304779e4bd9a399c01cf1180d15bf444
  1 file changed, 1 deletion(-)
 
 diff --git a/overlay/frameworks/base/core/res/res/values/config.xml b/overlay/frameworks/base/core/res/res/values/config.xml
-index 0cdc065..627c91e 100644
+index 28c7a28..48ca260 100644
 --- a/overlay/frameworks/base/core/res/res/values/config.xml
 +++ b/overlay/frameworks/base/core/res/res/values/config.xml
 @@ -22,7 +22,6 @@
@@ -18,8 +18,8 @@ index 0cdc065..627c91e 100644
  
 -	<string name="config_wallpaperCropperPackage">com.android.wallpaperpicker</string>
  	<bool name="config_unplugTurnsOnScreen">true</bool>
- 	<!-- Currently disabled for Android Go
- 	<integer name="config_multiuserMaximumUsers">4</integer>
+ 	<integer name="config_multiuserMaximumUsers">5</integer>
+ 	<bool name="config_enableMultiUserUI">true</bool>
 -- 
 2.17.1