#126 Remove google privacy policy

#122 fix themed app icon
This commit is contained in:
Carmelo Messina
2023-08-01 18:09:03 +02:00
parent a3a4a0f267
commit dd26fef46d
+115 -2
View File
@@ -6,6 +6,9 @@ Subject: Cromite Branding
build/BUILD.gn | 8 ++++
build/config/BUILDCONFIG.gn | 4 ++
chrome/android/java/AndroidManifest.xml | 2 +-
.../res/xml/legal_information_preferences.xml | 12 ------
.../android/java/res/xml/main_preferences.xml | 8 ++--
.../drawable/themed_app_icon.xml | 37 ++++++++++--------
.../mipmap-hdpi/app_icon.png | Bin 2435 -> 5784 bytes
.../mipmap-hdpi/layered_app_icon.png | Bin 1836 -> 7839 bytes
.../layered_app_icon_background.png | Bin 1487 -> 20191 bytes
@@ -33,14 +36,15 @@ Subject: Cromite Branding
.../prefs/chrome_pref_service_factory.cc | 6 +--
.../profiles/profile_shortcut_manager_win.cc | 2 +-
.../settings/settings_menu/settings_menu.html | 5 ++-
.../strings/android_chrome_strings.grd | 2 +-
chrome/common/url_constants.cc | 4 +-
.../drawable-hdpi/fre_product_logo.png | Bin 3912 -> 22295 bytes
.../drawable-mdpi/fre_product_logo.png | Bin 2490 -> 12171 bytes
.../drawable-xhdpi/fre_product_logo.png | Bin 5151 -> 34576 bytes
.../drawable-xxhdpi/fre_product_logo.png | Bin 7720 -> 60959 bytes
.../drawable-xxxhdpi/fre_product_logo.png | Bin 10740 -> 93273 bytes
tools/grit/grit/grd_reader.py | 35 ++++++++++++++++++
37 files changed, 76 insertions(+), 21 deletions(-)
tools/grit/grit/grd_reader.py | 35 +++++++++++++++++
41 files changed, 101 insertions(+), 55 deletions(-)
diff --git a/build/BUILD.gn b/build/BUILD.gn
--- a/build/BUILD.gn
@@ -86,6 +90,103 @@ diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/Andro
android:memtagMode="async"
android:largeHeap="false"
android:manageSpaceActivity="@string/manage_space_activity"
diff --git a/chrome/android/java/res/xml/legal_information_preferences.xml b/chrome/android/java/res/xml/legal_information_preferences.xml
--- a/chrome/android/java/res/xml/legal_information_preferences.xml
+++ b/chrome/android/java/res/xml/legal_information_preferences.xml
@@ -12,16 +12,4 @@ found in the LICENSE file.
android:key="open_source_license"
android:title="@string/open_source_license_title"
app:url="@string/open_source_license_url" />
- <org.chromium.chrome.browser.about_settings.HyperlinkPreference
- android:key="google_terms_of_service"
- android:title="@string/google_terms_of_service_title"
- app:url="@string/google_terms_of_service_url" />
- <org.chromium.chrome.browser.about_settings.HyperlinkPreference
- android:key="chrome_additional_terms_of_service"
- android:title="@string/chrome_additional_terms_of_service_title"
- app:url="@string/chrome_additional_terms_of_service_url" />
- <org.chromium.chrome.browser.about_settings.HyperlinkPreference
- android:key="privacy_policy"
- android:title="@string/privacy_policy_title"
- app:url="@string/google_privacy_policy_url" />
</PreferenceScreen>
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
@@ -8,20 +8,20 @@
android:order="0"/>
<PreferenceCategory
android:key="account_and_google_services_section"
- android:order="1"
+ android:order="1001"
android:title="@string/prefs_section_account_and_google_services"/>
<org.chromium.chrome.browser.sync.settings.SignInPreference
android:key="sign_in"
- android:order="2"
+ android:order="1002"
android:title="@string/sign_in_to_chrome"/>
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:key="manage_sync"
- android:order="3"
+ android:order="1003"
android:layout="@layout/account_management_account_row"
android:title="@string/sync_category_title"/>
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:key="google_services"
- android:order="4"
+ android:order="1004"
android:layout="@layout/account_management_account_row"
android:title="@string/prefs_google_services"
android:icon="@drawable/ic_google_services_48dp"
diff --git a/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml b/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml
--- a/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml
+++ b/chrome/android/java/res_chromium_base/drawable/themed_app_icon.xml
@@ -5,25 +5,28 @@ Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
-->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="90dp"
- android:height="90dp"
- android:viewportWidth="90"
- android:viewportHeight="90">
- <group>
- <clip-path
- android:pathData="M27,27h36v36h-36z"/>
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:name="vector"
+ android:width="900dp"
+ android:height="900dp"
+ android:viewportWidth="900"
+ android:viewportHeight="900">
+ <group android:name="group_1">
<path
- android:pathData="M35.7727,42.5589C36.3164,40.5268 37.5153,38.7308 39.1836,37.4494C40.8519,36.168 42.8963,35.4727 44.9999,35.4714H60.2305C58.6975,33.0202 56.5955,30.9753 54.1031,29.5104C51.6106,28.0454 48.8014,27.2038 45.9141,27.0569C43.0267,26.91 40.1466,27.4623 37.5184,28.6667C34.8901,29.8711 32.5914,31.6922 30.8176,33.9752L35.7727,42.5589Z"
- android:fillColor="#000000"/>
+ android:name="path_4"
+ android:pathData="M 564.7 383.6 L 531.1 417.2 C 532.6 422.5 533.7 426.1 534.5 428.4 C 535.9 432.5 536 433.6 536.3 446.3 C 536.4 454.7 536.3 461.7 535.9 464.7 C 535.5 467.4 534.8 470.4 534.4 471.4 C 534 472.3 533 475.2 532.3 477.7 L 531.1 482.3 C 583.2 534.3 598.5 549.4 598.7 549.4 C 599 549.4 600.6 547 602.3 544.1 C 604 541.2 607.5 534.7 610 529.8 C 612.4 524.9 616 516.9 617.7 512 C 619.5 507.1 621.8 500.2 622.8 496.7 C 623.7 493.2 625.2 486.9 625.9 482.6 C 626.7 478.3 627.8 469.7 628.3 463.6 C 629 455.7 629.2 449.9 628.9 444.3 C 628.7 439.8 628.1 432.8 627.7 428.7 C 627.2 424.6 626.2 418 625.4 414 C 624.6 410 623.2 404.2 622.3 401 C 621.4 397.9 619.5 392.1 618.1 388.1 C 616.8 384.1 613.4 376.3 610.5 370.8 C 607.7 365.3 604 358.3 602.3 355.3 C 600.6 352.5 599 350 598.7 350 C 598.5 350 583.2 365.1 564.7 383.6 Z"
+ android:fillColor="#000"
+ android:strokeWidth="1"/>
<path
- android:pathData="M47.4717,54.2625C45.4406,54.816 43.2832,54.6793 41.3381,53.8738C39.3931,53.0684 37.7706,51.6398 36.7254,49.8125L36.7163,49.8176L29.0945,36.6162C27.7398,39.171 27.0215,42.0149 27.0005,44.9065C26.9795,47.7982 27.6564,50.6522 28.9739,53.2264C30.2913,55.8006 32.2104,58.0189 34.5682,59.6931C36.926,61.3673 39.6529,62.448 42.5175,62.8433L47.4717,54.2625Z"
- android:fillColor="#000000"/>
+ android:name="path_5"
+ android:pathData="M 439.3 270.6 C 437 270.9 432.8 271.4 429.8 271.7 C 426.8 272.1 420.4 273.1 415.6 274 C 410.9 275 404.4 276.5 401.2 277.4 C 398.1 278.3 391.8 280.4 387.4 282 C 383 283.7 377.8 285.7 375.9 286.6 C 374 287.5 368.7 290.2 364.1 292.7 C 359.5 295.1 353.3 298.8 350.5 300.7 C 347.7 302.6 342.9 306.1 339.9 308.4 C 336.9 310.9 329.6 317.6 323.7 323.5 C 317.8 329.4 311.1 336.7 308.7 339.7 C 306.3 342.7 302.8 347.5 300.9 350.3 C 298.9 353.2 295.6 358.7 293.5 362.7 C 291.4 366.7 288.4 372.5 286.8 375.7 C 285.3 378.9 282.9 384.9 281.5 388.9 C 280 393 278.3 398.2 277.7 400.5 C 277 402.7 275.6 408.9 274.5 414.3 C 273.4 419.7 272.2 426.5 271.7 429.3 C 271.3 432.6 271 439.5 271 448.3 C 271.1 457.7 271.3 464.7 272 470.1 C 272.6 474.4 273.7 481.3 274.5 485.4 C 275.3 489.4 276.6 495.3 277.6 498.4 C 278.5 501.6 280.1 506.4 281.1 509.1 C 282.1 511.8 283.4 515.3 284 516.9 C 284.5 518.5 285.8 521.4 286.7 523.5 C 287.6 525.6 290.4 531 292.9 535.6 C 295.3 540.2 298.9 546.3 300.9 549.1 C 302.8 552 306.3 556.8 308.6 559.8 C 311.1 562.8 317.8 570.1 323.7 576 C 329.5 581.9 336.9 588.6 339.9 591 C 342.9 593.4 347.7 596.9 350.5 598.8 C 353.3 600.7 359.5 604.4 364.1 606.8 C 368.7 609.3 374 612 375.9 612.9 C 377.8 613.7 383 615.8 387.4 617.4 C 391.8 619.1 397.7 621.1 400.4 621.9 C 403.1 622.6 407.5 623.8 410.2 624.4 C 412.9 625 418.6 626 422.8 626.7 C 427.1 627.3 433.6 628.1 437.3 628.4 C 440.9 628.8 446.1 629.1 448.8 629.2 C 451.5 629.2 457.2 628.9 461.5 628.5 C 465.7 628.1 472.7 627.2 476.8 626.7 C 481.1 626 486.8 625 489.5 624.4 C 492.3 623.8 496.8 622.6 499.5 621.8 C 502.2 621.1 506.9 619.5 509.9 618.4 C 512.9 617.3 518 615.2 521.4 613.9 C 524.7 612.4 531.2 609.3 535.8 606.8 C 540.4 604.4 546.5 600.7 549.3 598.8 C 552.2 596.9 557 593.3 560 590.9 C 563 588.4 568 584.1 571 581.2 L 576.4 576 L 511.9 511.4 C 506.4 516.1 503.2 518.7 501.2 520.1 C 499.1 521.6 496 523.7 494.3 524.8 C 492.6 525.9 488.7 527.9 485.8 529.2 C 482.9 530.5 479.8 531.7 478.9 531.9 C 478 532.1 474.9 533.1 472.1 534 L 466.9 535.9 L 432.9 535.9 C 421.8 532.2 416.5 530.2 414 529 C 411.6 527.9 409.5 527 409.3 527 C 409.1 527 406.8 525.5 403.9 523.7 C 401.2 521.9 396.5 518.4 393.5 516 C 390.5 513.5 386.8 510.2 385.4 508.7 C 383.9 507.1 381 503.2 378.7 499.8 C 376.4 496.5 373.4 491.5 371.9 488.6 C 370.5 485.8 368 479.7 366.5 475.1 L 363.8 466.7 C 363.8 433.3 363.8 432.6 365.2 429 C 365.9 426.9 366.9 423.8 367.4 422.1 C 367.8 420.4 369.3 416.5 370.5 413.7 C 371.8 410.9 375.1 405.1 377.8 401 C 381.2 395.8 384.4 391.9 388.2 388.1 C 392 384.3 396.2 380.9 401.2 377.5 C 405.3 374.8 408.9 372.5 409.1 372.5 C 409.4 372.5 411.7 371.5 414.3 370.3 C 417 369 420.5 367.6 422.3 367.2 C 424 366.7 427.1 365.7 429.2 365 C 432.8 363.6 433.5 363.6 449.9 363.6 C 465.7 363.6 467.2 363.7 470.4 364.9 C 472.3 365.5 475.8 366.6 478.2 367.3 C 480.5 368 484.7 369.7 487.4 371 C 490.1 372.2 494.9 375.1 498.1 377.2 C 501.2 379.3 505.5 382.6 507.6 384.6 L 511.3 388 L 576.2 323.2 C 567.4 314.9 562.6 310.6 559.7 308.3 C 556.8 306 552.2 302.6 549.3 300.7 C 546.5 298.8 540.4 295.1 535.8 292.7 C 531.2 290.2 525.9 287.5 524 286.6 C 522.1 285.7 516.9 283.7 512.5 282 C 508 280.4 501.8 278.3 498.6 277.4 C 495.5 276.5 489 275 484.2 274 C 479.5 273.1 473 272.1 469.8 271.7 C 466.6 271.3 462.2 270.8 459.9 270.5 C 457.6 270.2 452.9 270 449.5 270 C 446.1 270.1 441.5 270.3 439.3 270.6 Z"
+ android:fillColor="#000"
+ android:strokeWidth="1"/>
<path
- android:pathData="M51.7725,38.2837C53.2584,39.7712 54.2112,41.7079 54.4828,43.7928C54.7544,45.8777 54.3296,47.9939 53.2744,49.8125L53.2849,49.8185L45.675,62.9999C48.5631,62.8968 51.3837,62.0985 53.8975,60.6728C56.4112,59.2471 58.5439,57.236 60.1147,54.8102C61.6854,52.3844 62.6478,49.6155 62.9202,46.7385C63.1926,43.8614 62.7669,40.9611 61.6793,38.2837H51.7725Z"
- android:fillColor="#000000"/>
- <path
- android:pathData="M45,51.7842C48.7279,51.7842 51.75,48.7621 51.75,45.0342C51.75,41.3063 48.7279,38.2842 45,38.2842C41.2721,38.2842 38.25,41.3063 38.25,45.0342C38.25,48.7621 41.2721,51.7842 45,51.7842Z"
- android:fillColor="#000000"/>
+ android:name="path_6"
+ android:pathData="M 439.6 392.7 C 438.5 392.9 435.6 393.7 433.2 394.5 C 430.9 395.2 427.4 396.5 425.6 397.4 C 423.8 398.3 422.2 399 422 399 C 421.8 399 420.1 400.1 418.2 401.5 C 416.2 402.8 414.1 404.3 413.5 404.8 C 412.8 405.3 410.8 407.1 409.1 408.9 C 407.3 410.6 405.4 412.7 404.8 413.5 C 404.3 414.2 402.9 416.3 401.7 418 C 400.5 419.8 398.8 422.9 397.7 425 C 396.7 427 395.4 430.7 394.6 433 C 393.9 435.4 393.1 438.8 392.8 440.5 C 392.5 442.2 392.4 447.6 392.5 452.3 C 392.8 459.8 393 461.7 394.4 466.2 C 395.4 469 396.9 472.9 397.8 474.8 C 398.7 476.7 400.5 479.8 401.8 481.7 C 403.1 483.5 404.5 485.6 405 486.3 C 405.4 486.9 407.4 489 409.3 490.8 C 411.2 492.7 414.6 495.6 416.8 497.1 C 419 498.7 422 500.5 423.4 501.1 C 424.9 501.7 426.7 502.6 427.5 503 C 428.3 503.4 430.9 504.4 433.2 505.1 C 435.6 505.8 438.7 506.6 440.1 506.8 C 441.6 507.1 446.1 507.3 450.2 507.3 C 454.3 507.3 458.8 507.1 460 506.8 C 461.3 506.5 463.9 505.9 465.8 505.4 C 467.7 504.8 471.3 503.4 473.8 502.3 C 476.4 501.2 480.5 498.8 483.1 497.1 C 485.6 495.3 488.8 492.7 490.2 491.2 C 491.6 489.8 493.6 487.6 494.6 486.3 C 495.6 485.1 497.4 482.7 498.5 481.1 C 499.6 479.5 501.2 476.6 502.2 474.5 C 503.2 472.4 504.6 468.8 505.3 466.5 C 505.9 464.1 506.8 460.8 507 459.2 C 507.3 457.6 507.5 453.3 507.5 449.5 C 507.5 445.6 507.3 441.4 507 439.9 C 506.8 438.5 505.9 435.4 505.3 433 C 504.5 430.7 503.1 427 502.1 425 C 501.1 422.9 499.4 419.8 498.2 418 C 497.1 416.3 495.9 414.5 495.4 414 C 494.9 413.6 493.8 412.2 492.9 411.1 C 492 410 489.8 407.8 488 406.3 C 486.2 404.8 483.4 402.6 481.6 401.4 C 479.9 400.2 476.9 398.5 475 397.6 C 473.1 396.7 469.2 395.2 466.4 394.2 C 461.6 392.7 460.3 392.6 451.4 392.4 C 446 392.3 440.7 392.4 439.6 392.7 Z"
+ android:fillColor="#000"
+ android:strokeWidth="1"/>
</group>
</vector>
diff --git a/chrome/android/java/res_chromium_base/mipmap-hdpi/app_icon.png b/chrome/android/java/res_chromium_base/mipmap-hdpi/app_icon.png
index 29078f04171497c630e17e1a075e2eed46ddad1a..c93db16d7051fedf5816107c2351f13c349c47ee 100644
GIT binary patch
@@ -13080,6 +13181,18 @@ diff --git a/chrome/browser/resources/settings/settings_menu/settings_menu.html
display: block;
height: var(--cr-icon-size);
margin-inline-end: 20px;
diff --git a/chrome/browser/ui/android/strings/android_chrome_strings.grd b/chrome/browser/ui/android/strings/android_chrome_strings.grd
--- a/chrome/browser/ui/android/strings/android_chrome_strings.grd
+++ b/chrome/browser/ui/android/strings/android_chrome_strings.grd
@@ -2117,7 +2117,7 @@ Your Google account may have other forms of browsing history like searches and a
About Chrome
</message>
<message name="IDS_LEGAL_INFORMATION_SUMMARY" desc="Summary for legal information" meaning="Android">
- Copyright <ph name="year">%1$d<ex>2014</ex></ph> Google LLC. All rights reserved.
+ <ph name="year">%1$d<ex>2014</ex></ph> Cromite.org
</message>
<message name="IDS_APPLICATION_VERSION_TITLE" desc="Title for application version">
Application version
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc