[6/6] Android 14 port

packages/apps/Launcher3/0001-Expose-themed-icon-setting-in-ThemePicker.patch

@@ -1,4 +1,4 @@
-From 8cd54396bbf29cc977497b53c1464a80aea69825 Mon Sep 17 00:00:00 2001
+From ca78711f5e5f3d23d11955f1f7368a3b4297ba40 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Mon, 11 Oct 2021 20:48:44 -0700
 Subject: [PATCH 1/4] Expose themed icon setting in ThemePicker
@@ -38,5 +38,5 @@ index 7d7054f5a5..d2955c4327 100644
  
      </application>
 -- 
-2.40.1
+2.41.0
 

packages/apps/Launcher3/0002-Properly-expose-GridCustomizationsProvider.patch

@@ -1,4 +1,4 @@
-From 0d97b73a079dd81b0dd8c0bb512a926d37f76cf9 Mon Sep 17 00:00:00 2001
+From 2e42cd9a638142a055e3ce55cfe767ff21e44cad Mon Sep 17 00:00:00 2001
 From: Luca Stefani <luca.stefani.ge1@gmail.com>
 Date: Fri, 1 Nov 2019 23:17:59 +0100
 Subject: [PATCH 2/4] Properly expose GridCustomizationsProvider
@@ -9,7 +9,7 @@ Change-Id: I8268a215257ae0e399c56ac8b44cdfdff8cc92a0
  1 file changed, 3 insertions(+), 1 deletion(-)
 
 diff --git a/AndroidManifest-common.xml b/AndroidManifest-common.xml
-index 0c7b48fe66..1fe86ad022 100644
+index 14605d8053..89ebe026f9 100644
 --- a/AndroidManifest-common.xml
 +++ b/AndroidManifest-common.xml
 @@ -137,7 +137,9 @@
@@ -24,5 +24,5 @@ index 0c7b48fe66..1fe86ad022 100644
          <!--
          The settings activity. To extend point settings_fragment_name to appropriate fragment class
 -- 
-2.40.1
+2.41.0
 

packages/apps/Launcher3/0003-Fix-all-apps-header-color-in-dark-mode.patch

@@ -1,4 +1,4 @@
-From 4fd73068a8fa6246676d52b6ae63f04341319520 Mon Sep 17 00:00:00 2001
+From 486d89b7393a33a3ebb8a1dd678c4f4c666e711e Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Wed, 6 Oct 2021 22:45:33 -0700
 Subject: [PATCH 3/4] Fix all apps header color in dark mode
@@ -9,17 +9,17 @@ Change-Id: Ib2ce7f6e3c9b87a4626699cb54673d88392a5f41
  1 file changed, 1 insertion(+)
 
 diff --git a/res/values/styles.xml b/res/values/styles.xml
-index 5dc4f0afa1..f5d64729c8 100644
+index c41f0e86e9..53a7498b3d 100644
 --- a/res/values/styles.xml
 +++ b/res/values/styles.xml
-@@ -94,6 +94,7 @@
+@@ -151,6 +151,7 @@
          <item name="android:colorControlHighlight">#19FFFFFF</item>
          <item name="android:colorPrimary">#FF212121</item>
-         <item name="allAppsScrimColor">?android:attr/colorBackgroundFloating</item>
+         <item name="allAppsScrimColor">?attr/materialColorSurfaceDim</item>
 +        <item name="allappsHeaderProtectionColor">@color/popup_color_tertiary_dark</item>
          <item name="allAppsNavBarScrimColor">#80000000</item>
          <item name="popupColorPrimary">@color/popup_color_primary_dark</item>
          <item name="popupColorSecondary">@color/popup_color_secondary_dark</item>
 -- 
-2.40.1
+2.41.0
 

packages/apps/Launcher3/0004-Disable-QSB-in-BuildConfig.patch

@@ -1,4 +1,4 @@
-From 8f1880d3576c0c6521e38558d56e55df92922c8a Mon Sep 17 00:00:00 2001
+From a7449be810f87a28a97c88507f5ba5f9b9ae0ffa Mon Sep 17 00:00:00 2001
 From: Peter Cai <peter@typeblog.net>
 Date: Fri, 7 Jul 2023 18:13:32 -0400
 Subject: [PATCH 4/4] Disable QSB in BuildConfig
@@ -22,5 +22,5 @@ index 1f2e0e5387..ab6c528580 100644
      /**
       * Flag to control various developer centric features
 -- 
-2.40.1
+2.41.0
 

packages/apps/Settings/0001-Global-VPN-feature-2-2.patch

@@ -1,4 +1,4 @@
-From 16c9311e41992ddd8d0bfb5a340cedbf001e3413 Mon Sep 17 00:00:00 2001
+From a70d53f488f7cfc9e5296df4fbc23e1c8a3955b3 Mon Sep 17 00:00:00 2001
 From: Oliver Scott <olivercscott@gmail.com>
 Date: Thu, 8 Jul 2021 10:40:49 -0400
 Subject: [PATCH] Global VPN feature [2/2]
@@ -9,19 +9,20 @@ Subject: [PATCH] Global VPN feature [2/2]
 Change-Id: Ic3b79beb635afe03642fce9473bc481239166566
 Signed-off-by: Mohammad Hasan Keramat J <ikeramat@protonmail.com>
 ---
- res/values/strings.xml                        |  5 ++
+ res/values/strings.xml                        |  6 +++
  res/xml/vpn_app_management.xml                |  6 +++
  .../settings/vpn2/AppManagementFragment.java  | 48 ++++++++++++++++++-
- 3 files changed, 58 insertions(+), 1 deletion(-)
+ 3 files changed, 59 insertions(+), 1 deletion(-)
 
 diff --git a/res/values/strings.xml b/res/values/strings.xml
-index 28b35b3fcf..29ca3882e9 100644
+index fa79cbbb33..d14a25abd1 100644
 --- a/res/values/strings.xml
 +++ b/res/values/strings.xml
-@@ -14457,4 +14457,9 @@
-     <!-- [CHAR LIMIT=NONE] Hint for QR code process failure -->
-     <string name="bt_le_audio_qr_code_is_not_valid_format">QR code isn\u0027t a valid format</string>
+@@ -12129,4 +12129,10 @@
  
+     <!-- Warning message when we try to dock an app not supporting multiple instances split into multiple sides [CHAR LIMIT=NONE] -->
+     <string name="dock_multi_instances_not_supported_text">"This app can only be opened in 1 window"</string>
++
 +    <!-- VPN app management screen, global VPN -->
 +    <string name="global_vpn_title">Global VPN</string>
 +    <string name="global_vpn_summary">Force all traffic on the device through this VPN, including work profile and other users.</string>
@@ -29,12 +30,12 @@ index 28b35b3fcf..29ca3882e9 100644
 +    <string name="global_vpn_summary_any_vpn_active">You need to disable all active VPN connections first to enable this</string>
  </resources>
 diff --git a/res/xml/vpn_app_management.xml b/res/xml/vpn_app_management.xml
-index adc441d846..e00f23ccfa 100644
+index dffbbbe311..93df378fd7 100644
 --- a/res/xml/vpn_app_management.xml
 +++ b/res/xml/vpn_app_management.xml
-@@ -31,6 +31,12 @@
+@@ -23,6 +23,12 @@
+                 android:key="version"
                  android:selectable="false"/>
-         -->
  
 +        <SwitchPreference
 +                android:key="global_vpn"
@@ -43,10 +44,10 @@ index adc441d846..e00f23ccfa 100644
 +                android:summary="@string/global_vpn_summary" />
 +
          <com.android.settingslib.RestrictedSwitchPreference
-                 android:order="10"
                  android:key="always_on_vpn"
+                 android:title="@string/vpn_menu_lockdown"
 diff --git a/src/com/android/settings/vpn2/AppManagementFragment.java b/src/com/android/settings/vpn2/AppManagementFragment.java
-index d4ee5b9c47..7a52e0c42c 100644
+index 7d17541fd9..260d3ad94d 100644
 --- a/src/com/android/settings/vpn2/AppManagementFragment.java
 +++ b/src/com/android/settings/vpn2/AppManagementFragment.java
 @@ -28,10 +28,12 @@ import android.content.pm.ApplicationInfo;
@@ -61,16 +62,16 @@ index d4ee5b9c47..7a52e0c42c 100644
 +import android.provider.Settings;
  import android.text.TextUtils;
  import android.util.Log;
- import android.widget.TextView;
-@@ -41,6 +43,7 @@ import androidx.appcompat.app.AlertDialog;
+ 
+@@ -39,6 +41,7 @@ import androidx.annotation.VisibleForTesting;
+ import androidx.appcompat.app.AlertDialog;
  import androidx.fragment.app.DialogFragment;
  import androidx.preference.Preference;
- import androidx.preference.PreferenceViewHolder;
 +import androidx.preference.SwitchPreference;
  
  import com.android.internal.net.VpnConfig;
  import com.android.internal.util.ArrayUtils;
-@@ -64,6 +67,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
+@@ -63,6 +66,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
      private static final String ARG_PACKAGE_NAME = "package";
  
      private static final String KEY_VERSION = "version";
@@ -78,18 +79,18 @@ index d4ee5b9c47..7a52e0c42c 100644
      private static final String KEY_ALWAYS_ON_VPN = "always_on_vpn";
      private static final String KEY_LOCKDOWN_VPN = "lockdown_vpn";
      private static final String KEY_FORGET_VPN = "forget_vpn";
-@@ -79,6 +83,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
-     private String mVpnLabel;
+@@ -80,6 +84,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
  
      // UI preference
+     private Preference mPreferenceVersion;
 +    private SwitchPreference mPreferenceGlobal;
      private RestrictedSwitchPreference mPreferenceAlwaysOn;
      private RestrictedSwitchPreference mPreferenceLockdown;
      private RestrictedPreference mPreferenceForget;
-@@ -123,10 +128,16 @@ public class AppManagementFragment extends SettingsPreferenceFragment
-         mDevicePolicyManager = getContext().getSystemService(DevicePolicyManager.class);
-         mVpnManager = getContext().getSystemService(VpnManager.class);
+@@ -126,10 +131,16 @@ public class AppManagementFragment extends SettingsPreferenceFragment
+         mFeatureProvider = FeatureFactory.getFactory(getContext()).getAdvancedVpnFeatureProvider();
  
+         mPreferenceVersion = findPreference(KEY_VERSION);
 +        mPreferenceGlobal = (SwitchPreference) findPreference(KEY_GLOBAL_VPN);
          mPreferenceAlwaysOn = (RestrictedSwitchPreference) findPreference(KEY_ALWAYS_ON_VPN);
          mPreferenceLockdown = (RestrictedSwitchPreference) findPreference(KEY_LOCKDOWN_VPN);
@@ -103,7 +104,7 @@ index d4ee5b9c47..7a52e0c42c 100644
          mPreferenceAlwaysOn.setOnPreferenceChangeListener(this);
          mPreferenceLockdown.setOnPreferenceChangeListener(this);
          mPreferenceForget.setOnPreferenceClickListener(this);
-@@ -204,6 +215,8 @@ public class AppManagementFragment extends SettingsPreferenceFragment
+@@ -163,6 +174,8 @@ public class AppManagementFragment extends SettingsPreferenceFragment
      @Override
      public boolean onPreferenceChange(Preference preference, Object newValue) {
          switch (preference.getKey()) {
@@ -112,7 +113,7 @@ index d4ee5b9c47..7a52e0c42c 100644
              case KEY_ALWAYS_ON_VPN:
                  return onAlwaysOnVpnClick((Boolean) newValue, mPreferenceLockdown.isChecked());
              case KEY_LOCKDOWN_VPN:
-@@ -243,6 +256,11 @@ public class AppManagementFragment extends SettingsPreferenceFragment
+@@ -202,6 +215,11 @@ public class AppManagementFragment extends SettingsPreferenceFragment
          return setAlwaysOnVpnByUI(alwaysOnSetting, lockdown);
      }
  
@@ -124,7 +125,7 @@ index d4ee5b9c47..7a52e0c42c 100644
      @Override
      public void onConfirmLockdown(Bundle options, boolean isEnabled, boolean isLockdown) {
          setAlwaysOnVpnByUI(isEnabled, isLockdown);
-@@ -276,7 +294,18 @@ public class AppManagementFragment extends SettingsPreferenceFragment
+@@ -235,7 +253,18 @@ public class AppManagementFragment extends SettingsPreferenceFragment
              final boolean alwaysOn = isVpnAlwaysOn();
              final boolean lockdown = alwaysOn
                      && VpnUtils.isAnyLockdownActive(getActivity());
@@ -144,7 +145,7 @@ index d4ee5b9c47..7a52e0c42c 100644
              mPreferenceAlwaysOn.setChecked(alwaysOn);
              mPreferenceLockdown.setChecked(lockdown);
              updateRestrictedViews();
-@@ -322,6 +351,11 @@ public class AppManagementFragment extends SettingsPreferenceFragment
+@@ -298,6 +327,11 @@ public class AppManagementFragment extends SettingsPreferenceFragment
          return mPackageName.equals(getAlwaysOnVpnPackage());
      }
  
@@ -156,7 +157,7 @@ index d4ee5b9c47..7a52e0c42c 100644
      /**
       * @return false if the intent doesn't contain an existing package or can't retrieve activated
       * vpn info.
-@@ -376,6 +410,18 @@ public class AppManagementFragment extends SettingsPreferenceFragment
+@@ -352,6 +386,18 @@ public class AppManagementFragment extends SettingsPreferenceFragment
          return config != null && !TextUtils.equals(config.user, mPackageName);
      }
  
@@ -176,5 +177,5 @@ index d4ee5b9c47..7a52e0c42c 100644
          private static final String TAG = "CannotConnect";
          private static final String ARG_VPN_LABEL = "label";
 -- 
-2.40.0
+2.41.0
 

packages/apps/ThemePicker/0001-Add-wallpaper-privapp-whitelist.patch

@@ -1,4 +1,4 @@
-From 12224023faccc52724a443670bd77c6aa229ce58 Mon Sep 17 00:00:00 2001
+From 1752966cf96e7c037db368e62f93233b5905ed64 Mon Sep 17 00:00:00 2001
 From: Luca Stefani <luca.stefani.ge1@gmail.com>
 Date: Fri, 1 Nov 2019 21:14:29 +0100
 Subject: [PATCH 1/5] Add wallpaper privapp whitelist
@@ -11,10 +11,10 @@ Change-Id: I044b1d9201ac0b8780fc37a387f401f3dd0ddeac
  create mode 100644 privapp_whitelist_com.android.wallpaper.xml
 
 diff --git a/Android.bp b/Android.bp
-index 6d9ff8f6..ff9413ac 100644
+index f6c85581..e25c6e3d 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -117,5 +117,15 @@ android_app {
+@@ -118,5 +118,15 @@ android_app {
      platform_apis: true,
      manifest: "AndroidManifest.xml",
      additional_manifests: [":WallpaperPicker2_Manifest"],
@@ -61,5 +61,5 @@ index 00000000..e3f3b658
 +    </privapp-permissions>
 +</permissions>
 -- 
-2.40.0
+2.41.0
 

packages/apps/ThemePicker/0002-Override-legacy-WallpaperPicker-app.patch

@@ -1,4 +1,4 @@
-From 4b626d87eafd37bf950550f5c14b42f5eaab19eb Mon Sep 17 00:00:00 2001
+From e2fec57334a92244d36ba79cbdd25a469400603b Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 19:00:36 -0700
 Subject: [PATCH 2/5] Override legacy WallpaperPicker app
@@ -9,10 +9,10 @@ Change-Id: I9a1907527eea0e8e7cd10bab64ba79c2c4006c59
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/Android.bp b/Android.bp
-index ff9413ac..dee08f45 100644
+index e25c6e3d..f2efc94e 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -119,7 +119,7 @@ android_app {
+@@ -120,7 +120,7 @@ android_app {
      additional_manifests: [":WallpaperPicker2_Manifest"],
  
      required: ["privapp_whitelist_com.android.wallpaper.xml"],
@@ -22,5 +22,5 @@ index ff9413ac..dee08f45 100644
  
  prebuilt_etc_xml {
 -- 
-2.40.0
+2.41.0
 

packages/apps/ThemePicker/0003-Add-wallpaper-default-permissions.patch

@@ -1,4 +1,4 @@
-From 0068121d698911e9bc86a224b3f9a2fb7bdc6cbc Mon Sep 17 00:00:00 2001
+From 0c493c5d97381bc1f809f15a4c948b47631a4346 Mon Sep 17 00:00:00 2001
 From: LuK1337 <priv.luk@gmail.com>
 Date: Tue, 15 Sep 2020 03:27:19 +0200
 Subject: [PATCH 3/5] Add wallpaper default permissions
@@ -11,10 +11,10 @@ Change-Id: If43a594da31fbab9280ce45b049737f6c534b620
  create mode 100644 default_permissions_com.android.wallpaper.xml
 
 diff --git a/Android.bp b/Android.bp
-index dee08f45..74479801 100644
+index f2efc94e..1a525b0e 100644
 --- a/Android.bp
 +++ b/Android.bp
-@@ -118,7 +118,11 @@ android_app {
+@@ -119,7 +119,11 @@ android_app {
      manifest: "AndroidManifest.xml",
      additional_manifests: [":WallpaperPicker2_Manifest"],
  
@@ -27,7 +27,7 @@ index dee08f45..74479801 100644
      overrides: ["WallpaperPicker2", "WallpaperPicker"],
  }
  
-@@ -129,3 +133,11 @@ prebuilt_etc_xml {
+@@ -130,3 +134,11 @@ prebuilt_etc_xml {
      filename_from_src: true,
      sub_dir: "permissions",
  }
@@ -83,5 +83,5 @@ index 00000000..41b23ce1
 +    </exception>
 +</exceptions>
 -- 
-2.40.0
+2.41.0
 

packages/apps/ThemePicker/0004-Specify-we-read-and-write-launcher-settings.patch

@@ -1,4 +1,4 @@
-From e51787a4ad9f2a70d9d68cad29a8974244c2c0b6 Mon Sep 17 00:00:00 2001
+From bb52f513459c59ad25248dc98c632ed455dfd4c5 Mon Sep 17 00:00:00 2001
 From: Luca Stefani <luca.stefani.ge1@gmail.com>
 Date: Fri, 1 Nov 2019 23:17:08 +0100
 Subject: [PATCH 4/5] Specify we read and write launcher settings
@@ -23,5 +23,5 @@ index 4e71bcc6..26f4fce0 100755
          tools:replace="android:icon,android:name"
          android:extractNativeLibs="false"
 -- 
-2.40.0
+2.41.0
 

packages/apps/ThemePicker/0005-Add-permission-for-launcher-preview-rendering.patch

@@ -1,4 +1,4 @@
-From 3156edaae20291237f095d2d5bb66e8ba0a4cea5 Mon Sep 17 00:00:00 2001
+From 0226fd9e4610eb6db37426afe6c7cb05e31aa5e6 Mon Sep 17 00:00:00 2001
 From: Danny Lin <danny@kdrag0n.dev>
 Date: Tue, 5 Oct 2021 22:40:58 -0700
 Subject: [PATCH 5/5] Add permission for launcher preview rendering
@@ -33,5 +33,5 @@ index e3f3b658..47133be8 100644
      </privapp-permissions>
  </permissions>
 -- 
-2.40.0
+2.41.0