From 94ca3a1ad2c571c00337776351837a05cb2a1d9e Mon Sep 17 00:00:00 2001
From: Carmelo Messina <uazo@users.noreply.github.com>
Date: Wed, 9 Oct 2024 17:33:54 +0200
Subject: [PATCH] Cromite Branding improve settings ui: adaptations for "Add
 custom tab intents privacy option" privacy settings

---
 .../Cromite-Branding--improve-settings-ui.patch | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/build/patches/Cromite-Branding--improve-settings-ui.patch b/build/patches/Cromite-Branding--improve-settings-ui.patch
index cba5ea00..0b9e8be3 100644
--- a/build/patches/Cromite-Branding--improve-settings-ui.patch
+++ b/build/patches/Cromite-Branding--improve-settings-ui.patch
@@ -8,10 +8,10 @@ License: GPL-2.0-or-later - https://spdx.org/licenses/GPL-2.0-or-later.html
 ---
  chrome/android/chrome_java_resources.gni      |   2 +-
  .../android/java/res/xml/main_preferences.xml |   4 +-
- .../res/xml/privacy_preferences_cromite.xml   | 184 ++++++++++++++++++
+ .../res/xml/privacy_preferences_cromite.xml   | 189 ++++++++++++++++++
  .../privacy/settings/PrivacySettings.java     |   2 +-
  .../Cromite-settings-ui.grdp                  |  15 ++
- 5 files changed, 203 insertions(+), 4 deletions(-)
+ 5 files changed, 208 insertions(+), 4 deletions(-)
  create mode 100644 chrome/android/java/res/xml/privacy_preferences_cromite.xml
  create mode 100644 chrome/browser/ui/android/strings/cromite_android_chrome_strings_grd/Cromite-settings-ui.grdp
 
@@ -30,7 +30,7 @@ diff --git a/chrome/android/chrome_java_resources.gni b/chrome/android/chrome_ja
 diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/java/res/xml/main_preferences.xml
 --- a/chrome/android/java/res/xml/main_preferences.xml
 +++ b/chrome/android/java/res/xml/main_preferences.xml
-@@ -13,7 +13,7 @@ found in the LICENSE file.
+@@ -7,7 +7,7 @@
          android:key="sync_promo"
          android:order="0"/>
      <PreferenceCategory
@@ -39,7 +39,7 @@ diff --git a/chrome/android/java/res/xml/main_preferences.xml b/chrome/android/j
          android:order="1001"
          android:title="@string/prefs_section_account_and_google_services"/>
      <org.chromium.chrome.browser.sync.settings.SignInPreference
-@@ -26,7 +26,7 @@ found in the LICENSE file.
+@@ -20,7 +20,7 @@
          android:layout="@layout/account_management_account_row"
          android:title="@string/sync_category_title"/>
      <org.chromium.components.browser_ui.settings.ChromeBasePreference
@@ -52,7 +52,7 @@ diff --git a/chrome/android/java/res/xml/privacy_preferences_cromite.xml b/chrom
 new file mode 100644
 --- /dev/null
 +++ b/chrome/android/java/res/xml/privacy_preferences_cromite.xml
-@@ -0,0 +1,184 @@
+@@ -0,0 +1,189 @@
 +<?xml version="1.0" encoding="utf-8"?><!--
 +Copyright 2022 The Chromium Authors
 +Use of this source code is governed by a BSD-style license that can be
@@ -118,6 +118,11 @@ new file mode 100644
 +        android:summary="@string/allow_custom_tab_intents_summary"
 +        android:defaultValue="false" />
 +    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
++        android:title="@string/uses_separate_storagepartition_for_cct_title"
++        android:summary="@string/uses_separate_storagepartition_for_cct_summary"
++        app:featureName="maylaunchurl-uses-separate-storage-partition"
++        app:needRestart="true" />
++    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
 +        android:key="allow_external_intent_requests"
 +        android:title="@string/allow_external_intent_requests_title"
 +        android:summary="@string/allow_external_intent_requests_summary"
@@ -240,7 +245,7 @@ new file mode 100644
 diff --git a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 --- a/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
 +++ b/chrome/android/java/src/org/chromium/chrome/browser/privacy/settings/PrivacySettings.java
-@@ -129,7 +129,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
+@@ -138,7 +138,7 @@ public class PrivacySettings extends ChromeBaseSettingsFragment
      public void onCreatePreferencesCromite(Bundle savedInstanceState, String rootKey) {
          getActivity().setTitle(R.string.prefs_privacy_security);