Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit 895bce13 authored by Carmelo Messina's avatar Carmelo Messina
Browse files

Cromite Branding: improve settings ui: fix wrong xml

parent 18be25a3
Loading
Loading
Loading
Loading
+114 −120
Original line number Diff line number Diff line
@@ -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   | 190 ++++++++++++++++++
 .../res/xml/privacy_preferences_cromite.xml   | 184 ++++++++++++++++++
 .../privacy/settings/PrivacySettings.java     |   2 +-
 .../Cromite-settings-ui.grdp                  |  15 ++
 5 files changed, 209 insertions(+), 4 deletions(-)
 5 files changed, 203 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

@@ -63,7 +63,7 @@ new file mode 100644
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+
+    <PreferenceCategory
+        android:title="@string/browsing_data_section_title">
+        android:title="@string/browsing_data_section_title"/>
+    <Preference
+        android:key="clear_browsing_data"
+        android:title="@string/clear_browsing_data_title"
@@ -86,10 +86,9 @@ new file mode 100644
+        android:title="@string/history_expire_days_threshold_title"
+        android:summary="@string/history_expire_days_threshold_summary"
+        app:singleLine="true" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/data_exposed_to_website_section_title">
+        android:title="@string/data_exposed_to_website_section_title"/>
+    <org.chromium.components.browser_ui.settings.ChromeBasePreference
+        android:key="third_party_cookies"
+        android:title="@string/third_party_cookies_link_row_label"
@@ -110,10 +109,9 @@ new file mode 100644
+        android:key="can_make_payment"
+        android:title="@string/can_make_payment_title"
+        android:summary="@string/settings_can_make_payment_toggle_label" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/data_exposed_to_device_section_title">
+        android:title="@string/data_exposed_to_device_section_title"/>
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="allow_custom_tab_intents"
+        android:title="@string/allow_custom_tab_intents_title"
@@ -136,10 +134,9 @@ new file mode 100644
+        android:title="@string/tabgrid_use_icons_title"
+        android:summary="@string/tabgrid_use_icons_summary"
+        android:defaultValue="false" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/incognito_related_section_title">
+        android:title="@string/incognito_related_section_title"/>
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="open_external_links_incognito"
+        android:title="@string/open_external_links_incognito_title"
@@ -155,11 +152,10 @@ new file mode 100644
+        android:title="@string/incognito_settings_title"
+        android:summary="@string/incognito_settings_summary"
+        android:fragment="org.chromium.chrome.browser.privacy.settings.IncognitoSettings"/>
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:key="security_section"
+        android:title="@string/security_section_title">
+        android:title="@string/security_section_title"/>
+    <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+        android:key="https_first_mode"
+        android:title="@string/settings_https_first_mode_title"
@@ -168,10 +164,9 @@ new file mode 100644
+        android:key="secure_dns"
+        android:title="@string/settings_secure_dns_title"
+        android:fragment="org.chromium.chrome.browser.privacy.secure_dns.SecureDnsSettings" />
+    </PreferenceCategory>
+
+    <PreferenceCategory
+        android:title="@string/services_category_title">
+        android:title="@string/services_category_title"/>
+    <org.chromium.chrome.browser.about_settings.HyperlinkPreference
+        android:key="proxy"
+        android:title="@string/proxy_title"
@@ -190,7 +185,6 @@ new file mode 100644
+        android:title="@string/cablev2_paask_title"
+        android:summary="@string/cablev2_paask_body"
+        android:fragment="org.chromium.chrome.browser.webauthn.PrivacySettingsFragment" />
+    </PreferenceCategory>
+
+    <!--Always hidden-->
+    <Preference