From 54166dfe58196f2107df8812405ffd2bf5ffd2ea Mon Sep 17 00:00:00 2001 From: Brian Johnson <34129+bridiver@users.noreply.github.com> Date: Wed, 14 Jan 2026 06:56:06 -0700 Subject: [PATCH] Revert "Move files that overwrite chromium resources to their own directory" (#33203) Revert "Move files that are copied to chromium to their own directory (#33159)" This reverts commit 9324eec2d30ee57ee45524cb9ad47438030860b7. --- PRESUBMIT.py | 14 +- .../java/res_template/xml/file_paths.xml | 0 android/java/res_template/xml/syncadapter.xml | 6 + .../common/favicon_bookmarks.png | Bin .../common/favicon_downloads.png | Bin .../common/favicon_ntp.png | Bin .../common/favicon_settings.png | Bin .../incognito_data_not_saved_header_dark.png | Bin .../incognito_data_not_saved_header_light.png | Bin .../common/profile_avatar_placeholder.png | Bin .../profile_avatar_placeholder_large.png | Bin .../common/save_address.png | Bin .../common/save_address_dark.png | Bin .../default_100_percent/common/save_card.png | Bin .../common/save_card_dark.png | Bin .../common/save_password.png | Bin .../common/save_password_dark.png | Bin .../common/save_password_multi_device.png | Bin 0 -> 1586 bytes .../save_password_multi_device_dark.png | Bin 0 -> 1586 bytes .../common/save_password_one_device.png | Bin 0 -> 1586 bytes .../common/save_password_one_device_dark.png | Bin 0 -> 1586 bytes .../downloads_empty_state_illustration.xml | 0 .../downloads_empty_state_illustration.xml | 0 ...dynamic_download_search_bar_background.xml | 0 .../java/res/layout/incognito_reauth_view.xml | 0 browser/resources/chrome-logo-faded.png | Bin 0 -> 2793 bytes .../reading_list/images/read_later_empty.svg | 0 .../images/read_later_empty_dark.svg | 0 .../signin/images/shared_left_banner.svg | 0 .../signin/images/shared_left_banner_dark.svg | 0 .../signin/images/shared_right_banner.svg | 0 .../images/shared_right_banner_dark.svg | 0 .../profile_customization_illustration.svg | 0 ...rofile_customization_illustration_dark.svg | 0 .../images/dark_mode_left_banner_image.svg | 1 + .../images/dark_mode_right_banner_image.svg | 1 + .../images/left_banner_image.svg | 1 + .../images/right_banner_image.svg | 1 + .../res/xml/safe_browsing_preferences.xml | 0 .../res/layout/touch_to_fill_header_item.xml | 0 .../res/drawable-hdpi/btn_toolbar_reload.png | Bin .../res/drawable-hdpi/incognito_simple.png | Bin .../btn_toolbar_reload.png | Bin .../btn_toolbar_reload.png | Bin .../btn_toolbar_reload.png | Bin .../btn_toolbar_reload.png | Bin .../btn_toolbar_reload.png | Bin .../res/drawable-mdpi/btn_toolbar_reload.png | Bin .../res/drawable-mdpi/incognito_simple.png | Bin .../res/drawable-xhdpi/btn_toolbar_reload.png | Bin .../res/drawable-xhdpi/incognito_simple.png | Bin .../drawable-xxhdpi/btn_toolbar_reload.png | Bin .../res/drawable-xxhdpi/incognito_simple.png | Bin .../drawable-xxxhdpi/btn_toolbar_reload.png | Bin .../res/drawable-xxxhdpi/incognito_simple.png | Bin .../res/layout/bottom_control_container.xml | 0 build/chromium/resources/README.md | 1 - build/commands/lib/branding.js | 353 +++++++++++++++++- .../default_text_color_on_accent1_list.xml | 0 .../java/res/drawable/ic_desktop_windows.xml | 0 .../java/res/drawable/ic_keep_24dp.xml | 0 .../java/res/drawable/ic_keep_off_24dp.xml | 0 .../java/res/drawable/star_outline_24dp.xml | 0 .../color/home_surface_background_color.xml | 0 .../java/res/drawable-hdpi/btn_info.png | Bin .../java/res/drawable-mdpi/btn_info.png | Bin .../java/res/drawable-xhdpi/btn_info.png | Bin .../java/res/drawable-xxhdpi/btn_info.png | Bin .../java/res/drawable-xxxhdpi/btn_info.png | Bin ...ern_toolbar_tablet_text_box_background.xml | 0 .../res/drawable/ic_settings_tune_24dp.xml | 0 .../default_100_percent/favicon_history.png | Bin .../default_200_percent/favicon_history.png | Bin .../infobar_translate_compact.png | Bin .../infobar_translate_compact.png | Bin .../infobar_translate_compact.png | Bin .../infobar_translate_compact.png | Bin .../infobar_translate_compact.png | Bin .../java/res/drawable-hdpi/ic_search.png | Bin .../java/res/drawable-mdpi/ic_search.png | Bin .../java/res/drawable-xhdpi/ic_search.png | Bin .../java/res/drawable-xxhdpi/ic_search.png | Bin .../java/res/drawable-xxxhdpi/ic_search.png | Bin .../java/res/drawable-hdpi/btn_close.png | Bin .../java/res/drawable-mdpi/btn_close.png | Bin .../java/res/drawable-xhdpi/btn_close.png | Bin .../java/res/drawable-xxhdpi/btn_close.png | Bin .../java/res/drawable-xxxhdpi/btn_close.png | Bin 88 files changed, 356 insertions(+), 22 deletions(-) rename {build/chromium/resources/chrome/android => android}/java/res_template/xml/file_paths.xml (100%) create mode 100644 android/java/res_template/xml/syncadapter.xml rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/favicon_bookmarks.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/favicon_downloads.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/favicon_ntp.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/favicon_settings.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/incognito_data_not_saved_header_dark.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/incognito_data_not_saved_header_light.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/profile_avatar_placeholder.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/profile_avatar_placeholder_large.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/save_address.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/save_address_dark.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/save_card.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/save_card_dark.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/save_password.png (100%) rename {build/chromium/resources/chrome/app => app}/theme/default_100_percent/common/save_password_dark.png (100%) create mode 100644 app/theme/default_100_percent/common/save_password_multi_device.png create mode 100644 app/theme/default_100_percent/common/save_password_multi_device_dark.png create mode 100644 app/theme/default_100_percent/common/save_password_one_device.png create mode 100644 app/theme/default_100_percent/common/save_password_one_device_dark.png rename {build/chromium/resources/chrome/browser => browser}/download/internal/android/java/res/drawable-night/downloads_empty_state_illustration.xml (100%) rename {build/chromium/resources/chrome/browser => browser}/download/internal/android/java/res/drawable/downloads_empty_state_illustration.xml (100%) rename {build/chromium/resources/chrome/browser => browser}/download/internal/android/java/res/drawable/no_dynamic_download_search_bar_background.xml (100%) rename {build/chromium/resources/chrome/browser => browser}/incognito/android/java/res/layout/incognito_reauth_view.xml (100%) create mode 100644 browser/resources/chrome-logo-faded.png rename {build/chromium/resources/chrome/browser => browser}/resources/side_panel/reading_list/images/read_later_empty.svg (100%) rename {build/chromium/resources/chrome/browser => browser}/resources/side_panel/reading_list/images/read_later_empty_dark.svg (100%) rename {build/chromium/resources/chrome/browser => browser}/resources/signin/images/shared_left_banner.svg (100%) rename {build/chromium/resources/chrome/browser => browser}/resources/signin/images/shared_left_banner_dark.svg (100%) rename {build/chromium/resources/chrome/browser => browser}/resources/signin/images/shared_right_banner.svg (100%) rename {build/chromium/resources/chrome/browser => browser}/resources/signin/images/shared_right_banner_dark.svg (100%) rename {build/chromium/resources/chrome/browser => browser}/resources/signin/profile_customization/images/profile_customization_illustration.svg (100%) rename {build/chromium/resources/chrome/browser => browser}/resources/signin/profile_customization/images/profile_customization_illustration_dark.svg (100%) create mode 100644 browser/resources/signin/profile_picker/images/dark_mode_left_banner_image.svg create mode 100644 browser/resources/signin/profile_picker/images/dark_mode_right_banner_image.svg create mode 100644 browser/resources/signin/profile_picker/images/left_banner_image.svg create mode 100644 browser/resources/signin/profile_picker/images/right_banner_image.svg rename {build/chromium/resources/chrome/browser => browser}/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml (100%) rename {build/chromium/resources/chrome/browser => browser}/touch_to_fill/password_manager/android/internal/java/res/layout/touch_to_fill_header_item.xml (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-hdpi/btn_toolbar_reload.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-hdpi/incognito_simple.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-ldrtl-hdpi/btn_toolbar_reload.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-ldrtl-mdpi/btn_toolbar_reload.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-ldrtl-xhdpi/btn_toolbar_reload.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-ldrtl-xxhdpi/btn_toolbar_reload.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-ldrtl-xxxhdpi/btn_toolbar_reload.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-mdpi/btn_toolbar_reload.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-mdpi/incognito_simple.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-xhdpi/btn_toolbar_reload.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-xhdpi/incognito_simple.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-xxhdpi/btn_toolbar_reload.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-xxhdpi/incognito_simple.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-xxxhdpi/btn_toolbar_reload.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/drawable-xxxhdpi/incognito_simple.png (100%) rename {build/chromium/resources/chrome/browser => browser}/ui/android/toolbar/java/res/layout/bottom_control_container.xml (100%) delete mode 100644 build/chromium/resources/README.md rename {build/chromium/resources/components => components}/browser_ui/styles/android/java/res/color/default_text_color_on_accent1_list.xml (100%) rename {build/chromium/resources/components => components}/browser_ui/styles/android/java/res/drawable/ic_desktop_windows.xml (100%) rename {build/chromium/resources/components => components}/browser_ui/styles/android/java/res/drawable/ic_keep_24dp.xml (100%) rename {build/chromium/resources/components => components}/browser_ui/styles/android/java/res/drawable/ic_keep_off_24dp.xml (100%) rename {build/chromium/resources/components => components}/browser_ui/styles/android/java/res/drawable/star_outline_24dp.xml (100%) rename {build/chromium/resources/components => components}/browser_ui/widget/android/java/res/color/home_surface_background_color.xml (100%) rename {build/chromium/resources/components => components}/browser_ui/widget/android/java/res/drawable-hdpi/btn_info.png (100%) rename {build/chromium/resources/components => components}/browser_ui/widget/android/java/res/drawable-mdpi/btn_info.png (100%) rename {build/chromium/resources/components => components}/browser_ui/widget/android/java/res/drawable-xhdpi/btn_info.png (100%) rename {build/chromium/resources/components => components}/browser_ui/widget/android/java/res/drawable-xxhdpi/btn_info.png (100%) rename {build/chromium/resources/components => components}/browser_ui/widget/android/java/res/drawable-xxxhdpi/btn_info.png (100%) rename {build/chromium/resources/components => components}/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml (100%) rename {build/chromium/resources/components => components}/omnibox/browser/android/java/res/drawable/ic_settings_tune_24dp.xml (100%) rename {build/chromium/resources/components => components}/resources/default_100_percent/favicon_history.png (100%) rename {build/chromium/resources/components => components}/resources/default_200_percent/favicon_history.png (100%) rename {build/chromium/resources/components => components}/translate/content/android/java/res/drawable-hdpi/infobar_translate_compact.png (100%) rename {build/chromium/resources/components => components}/translate/content/android/java/res/drawable-mdpi/infobar_translate_compact.png (100%) rename {build/chromium/resources/components => components}/translate/content/android/java/res/drawable-xhdpi/infobar_translate_compact.png (100%) rename {build/chromium/resources/components => components}/translate/content/android/java/res/drawable-xxhdpi/infobar_translate_compact.png (100%) rename {build/chromium/resources/components => components}/translate/content/android/java/res/drawable-xxxhdpi/infobar_translate_compact.png (100%) rename {build/chromium/resources/content => content}/public/android/java/res/drawable-hdpi/ic_search.png (100%) rename {build/chromium/resources/content => content}/public/android/java/res/drawable-mdpi/ic_search.png (100%) rename {build/chromium/resources/content => content}/public/android/java/res/drawable-xhdpi/ic_search.png (100%) rename {build/chromium/resources/content => content}/public/android/java/res/drawable-xxhdpi/ic_search.png (100%) rename {build/chromium/resources/content => content}/public/android/java/res/drawable-xxxhdpi/ic_search.png (100%) rename {build/chromium/resources/ui => ui}/android/java/res/drawable-hdpi/btn_close.png (100%) rename {build/chromium/resources/ui => ui}/android/java/res/drawable-mdpi/btn_close.png (100%) rename {build/chromium/resources/ui => ui}/android/java/res/drawable-xhdpi/btn_close.png (100%) rename {build/chromium/resources/ui => ui}/android/java/res/drawable-xxhdpi/btn_close.png (100%) rename {build/chromium/resources/ui => ui}/android/java/res/drawable-xxxhdpi/btn_close.png (100%) diff --git a/PRESUBMIT.py b/PRESUBMIT.py index d52268a4576..c32481d384a 100644 --- a/PRESUBMIT.py +++ b/PRESUBMIT.py @@ -251,7 +251,7 @@ def CheckNewThemeFilesForUpstreamOverride(input_api, output_api): source_file_filter = lambda f: input_api.FilterSourceFile( f, - files_to_check=[r"^app/theme/.*", r"^build/chromium/resources/.*"], + files_to_check=[r"^app/theme/.*"], files_to_skip=input_api.DEFAULT_FILES_TO_SKIP) new_sources = [] @@ -274,15 +274,9 @@ def CheckNewThemeFilesForUpstreamOverride(input_api, output_api): upstream_file = f.replace('/brave_origin/', '/chromium/', 1) elif '/brave/' in f: upstream_file = f.replace('/brave/', '/chromium/', 1) - - if 'build/chromium/resources/' in f: - upstream_file = f.replace('build/chromium/resources/', '//', 1) - elif 'app/theme/' in f: - upstream_file = f'//chrome/{upstream_file}' else: upstream_file = f - - path = brave_chromium_utils.wspath(upstream_file) + path = brave_chromium_utils.wspath(f'//chrome/{upstream_file}') if not os.path.exists(path): problems.append(upstream_file) @@ -291,8 +285,8 @@ def CheckNewThemeFilesForUpstreamOverride(input_api, output_api): output_api.PresubmitError( 'Missing upstream theme file to override', items=sorted(problems), - long_text='app/theme and build/chromium/resources should only ' - 'be used for overrides of upstream files. Channel-specific ' + long_text='app/theme should only be used for overrides of ' + 'upstream theme files in chrome/app/theme. Channel-specific ' 'theme assets (e.g., dev/beta/nightly) are exempt.') ] return [] diff --git a/build/chromium/resources/chrome/android/java/res_template/xml/file_paths.xml b/android/java/res_template/xml/file_paths.xml similarity index 100% rename from build/chromium/resources/chrome/android/java/res_template/xml/file_paths.xml rename to android/java/res_template/xml/file_paths.xml diff --git a/android/java/res_template/xml/syncadapter.xml b/android/java/res_template/xml/syncadapter.xml new file mode 100644 index 00000000000..870c92d0e06 --- /dev/null +++ b/android/java/res_template/xml/syncadapter.xml @@ -0,0 +1,6 @@ + + + + + + diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_bookmarks.png b/app/theme/default_100_percent/common/favicon_bookmarks.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_bookmarks.png rename to app/theme/default_100_percent/common/favicon_bookmarks.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_downloads.png b/app/theme/default_100_percent/common/favicon_downloads.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_downloads.png rename to app/theme/default_100_percent/common/favicon_downloads.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_ntp.png b/app/theme/default_100_percent/common/favicon_ntp.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_ntp.png rename to app/theme/default_100_percent/common/favicon_ntp.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_settings.png b/app/theme/default_100_percent/common/favicon_settings.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/favicon_settings.png rename to app/theme/default_100_percent/common/favicon_settings.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/incognito_data_not_saved_header_dark.png b/app/theme/default_100_percent/common/incognito_data_not_saved_header_dark.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/incognito_data_not_saved_header_dark.png rename to app/theme/default_100_percent/common/incognito_data_not_saved_header_dark.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/incognito_data_not_saved_header_light.png b/app/theme/default_100_percent/common/incognito_data_not_saved_header_light.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/incognito_data_not_saved_header_light.png rename to app/theme/default_100_percent/common/incognito_data_not_saved_header_light.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/profile_avatar_placeholder.png b/app/theme/default_100_percent/common/profile_avatar_placeholder.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/profile_avatar_placeholder.png rename to app/theme/default_100_percent/common/profile_avatar_placeholder.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/profile_avatar_placeholder_large.png b/app/theme/default_100_percent/common/profile_avatar_placeholder_large.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/profile_avatar_placeholder_large.png rename to app/theme/default_100_percent/common/profile_avatar_placeholder_large.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/save_address.png b/app/theme/default_100_percent/common/save_address.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/save_address.png rename to app/theme/default_100_percent/common/save_address.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/save_address_dark.png b/app/theme/default_100_percent/common/save_address_dark.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/save_address_dark.png rename to app/theme/default_100_percent/common/save_address_dark.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/save_card.png b/app/theme/default_100_percent/common/save_card.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/save_card.png rename to app/theme/default_100_percent/common/save_card.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/save_card_dark.png b/app/theme/default_100_percent/common/save_card_dark.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/save_card_dark.png rename to app/theme/default_100_percent/common/save_card_dark.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/save_password.png b/app/theme/default_100_percent/common/save_password.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/save_password.png rename to app/theme/default_100_percent/common/save_password.png diff --git a/build/chromium/resources/chrome/app/theme/default_100_percent/common/save_password_dark.png b/app/theme/default_100_percent/common/save_password_dark.png similarity index 100% rename from build/chromium/resources/chrome/app/theme/default_100_percent/common/save_password_dark.png rename to app/theme/default_100_percent/common/save_password_dark.png diff --git a/app/theme/default_100_percent/common/save_password_multi_device.png b/app/theme/default_100_percent/common/save_password_multi_device.png new file mode 100644 index 0000000000000000000000000000000000000000..d884b8a87b7233eb33258d9758feda099f8809a4 GIT binary patch literal 1586 zcmcIk%Z}Vc6!jn_f=G$7KnTIcayCJvx?Fy{6lXHD2c{)Fj3zB*SdntM+-*(UW$c>i zo?*uh39-u;us~t~AHV_$*zp1R06u^%3(#=g4-=t0W)n-cukCZsJ@?`J)xrKp*RQ>E zP1CgNqrLc0)3)w|z4iK4xc>OZ{0ZFNsP{f?HSNZ4-MRJn{TuIU+Ld35@sT=8KBioj z1D45D3>IY#XidAjy{H*K7D`XWq^Kg}&!2ua^dgIlhi+mf^-xTUz4JyqINu-h^J5-n z#`Zn^?t%hADHPKe<*aJyA~Ke|6zuLbHuNP#9Y@Aa7f?S+4)mdHgzgSJ#EE0+emEeW z8CuRA-7<-fO&=2*nS`1iwL^V<7!a+=a(WnlxQ+!+kug=OrWnuX^TFI6$Yz2`7>3xi zuw@}Yp!Td%Y=Nrw)`lS#EpLii6|&MhMwZGG6&av(l|otfv{kz<6BG{8kQ zljOzFvh2~V+C7CRYrW4TZpUY}z=xuhCk+?7r=n7~Ho-F9`_?DTY?*1sv6zVxU@ZtE zeW-dWm29W-IeGM-`)q1DYy?xX8B00aH0of(q7R4q?T1B`$$9%;r)LcpF;gNkEYmWP z=^@h@6PFU3+Ai4CG*{3BrXXXAT@Ea>B0swfG)d^FY89)v7{!qRq6S5g(a_@-^DGCs zgt^EkPKMGT@R1h?JFq<454>!t3;birPrBlD{;Q$QBnOVZJ~Z{cAV^(-z}G}1bOZ`a z&p{5!1C}$!+`!wgebN;0->})!tevW?Qze`{O??wtg4rk}4nvH%HgW5;*^77NIJ^}2Xg^)97zhtMJe-W>Eok18eu6?{50AvfmoT uJLBMY{`bYj_OG|!zVhv(H@}WG?XM@VU3~HVH=lJ|eYCqD|M0=1FaHI0>Fuxp literal 0 HcmV?d00001 diff --git a/app/theme/default_100_percent/common/save_password_multi_device_dark.png b/app/theme/default_100_percent/common/save_password_multi_device_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..d884b8a87b7233eb33258d9758feda099f8809a4 GIT binary patch literal 1586 zcmcIk%Z}Vc6!jn_f=G$7KnTIcayCJvx?Fy{6lXHD2c{)Fj3zB*SdntM+-*(UW$c>i zo?*uh39-u;us~t~AHV_$*zp1R06u^%3(#=g4-=t0W)n-cukCZsJ@?`J)xrKp*RQ>E zP1CgNqrLc0)3)w|z4iK4xc>OZ{0ZFNsP{f?HSNZ4-MRJn{TuIU+Ld35@sT=8KBioj z1D45D3>IY#XidAjy{H*K7D`XWq^Kg}&!2ua^dgIlhi+mf^-xTUz4JyqINu-h^J5-n z#`Zn^?t%hADHPKe<*aJyA~Ke|6zuLbHuNP#9Y@Aa7f?S+4)mdHgzgSJ#EE0+emEeW z8CuRA-7<-fO&=2*nS`1iwL^V<7!a+=a(WnlxQ+!+kug=OrWnuX^TFI6$Yz2`7>3xi zuw@}Yp!Td%Y=Nrw)`lS#EpLii6|&MhMwZGG6&av(l|otfv{kz<6BG{8kQ zljOzFvh2~V+C7CRYrW4TZpUY}z=xuhCk+?7r=n7~Ho-F9`_?DTY?*1sv6zVxU@ZtE zeW-dWm29W-IeGM-`)q1DYy?xX8B00aH0of(q7R4q?T1B`$$9%;r)LcpF;gNkEYmWP z=^@h@6PFU3+Ai4CG*{3BrXXXAT@Ea>B0swfG)d^FY89)v7{!qRq6S5g(a_@-^DGCs zgt^EkPKMGT@R1h?JFq<454>!t3;birPrBlD{;Q$QBnOVZJ~Z{cAV^(-z}G}1bOZ`a z&p{5!1C}$!+`!wgebN;0->})!tevW?Qze`{O??wtg4rk}4nvH%HgW5;*^77NIJ^}2Xg^)97zhtMJe-W>Eok18eu6?{50AvfmoT uJLBMY{`bYj_OG|!zVhv(H@}WG?XM@VU3~HVH=lJ|eYCqD|M0=1FaHI0>Fuxp literal 0 HcmV?d00001 diff --git a/app/theme/default_100_percent/common/save_password_one_device.png b/app/theme/default_100_percent/common/save_password_one_device.png new file mode 100644 index 0000000000000000000000000000000000000000..d884b8a87b7233eb33258d9758feda099f8809a4 GIT binary patch literal 1586 zcmcIk%Z}Vc6!jn_f=G$7KnTIcayCJvx?Fy{6lXHD2c{)Fj3zB*SdntM+-*(UW$c>i zo?*uh39-u;us~t~AHV_$*zp1R06u^%3(#=g4-=t0W)n-cukCZsJ@?`J)xrKp*RQ>E zP1CgNqrLc0)3)w|z4iK4xc>OZ{0ZFNsP{f?HSNZ4-MRJn{TuIU+Ld35@sT=8KBioj z1D45D3>IY#XidAjy{H*K7D`XWq^Kg}&!2ua^dgIlhi+mf^-xTUz4JyqINu-h^J5-n z#`Zn^?t%hADHPKe<*aJyA~Ke|6zuLbHuNP#9Y@Aa7f?S+4)mdHgzgSJ#EE0+emEeW z8CuRA-7<-fO&=2*nS`1iwL^V<7!a+=a(WnlxQ+!+kug=OrWnuX^TFI6$Yz2`7>3xi zuw@}Yp!Td%Y=Nrw)`lS#EpLii6|&MhMwZGG6&av(l|otfv{kz<6BG{8kQ zljOzFvh2~V+C7CRYrW4TZpUY}z=xuhCk+?7r=n7~Ho-F9`_?DTY?*1sv6zVxU@ZtE zeW-dWm29W-IeGM-`)q1DYy?xX8B00aH0of(q7R4q?T1B`$$9%;r)LcpF;gNkEYmWP z=^@h@6PFU3+Ai4CG*{3BrXXXAT@Ea>B0swfG)d^FY89)v7{!qRq6S5g(a_@-^DGCs zgt^EkPKMGT@R1h?JFq<454>!t3;birPrBlD{;Q$QBnOVZJ~Z{cAV^(-z}G}1bOZ`a z&p{5!1C}$!+`!wgebN;0->})!tevW?Qze`{O??wtg4rk}4nvH%HgW5;*^77NIJ^}2Xg^)97zhtMJe-W>Eok18eu6?{50AvfmoT uJLBMY{`bYj_OG|!zVhv(H@}WG?XM@VU3~HVH=lJ|eYCqD|M0=1FaHI0>Fuxp literal 0 HcmV?d00001 diff --git a/app/theme/default_100_percent/common/save_password_one_device_dark.png b/app/theme/default_100_percent/common/save_password_one_device_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..d884b8a87b7233eb33258d9758feda099f8809a4 GIT binary patch literal 1586 zcmcIk%Z}Vc6!jn_f=G$7KnTIcayCJvx?Fy{6lXHD2c{)Fj3zB*SdntM+-*(UW$c>i zo?*uh39-u;us~t~AHV_$*zp1R06u^%3(#=g4-=t0W)n-cukCZsJ@?`J)xrKp*RQ>E zP1CgNqrLc0)3)w|z4iK4xc>OZ{0ZFNsP{f?HSNZ4-MRJn{TuIU+Ld35@sT=8KBioj z1D45D3>IY#XidAjy{H*K7D`XWq^Kg}&!2ua^dgIlhi+mf^-xTUz4JyqINu-h^J5-n z#`Zn^?t%hADHPKe<*aJyA~Ke|6zuLbHuNP#9Y@Aa7f?S+4)mdHgzgSJ#EE0+emEeW z8CuRA-7<-fO&=2*nS`1iwL^V<7!a+=a(WnlxQ+!+kug=OrWnuX^TFI6$Yz2`7>3xi zuw@}Yp!Td%Y=Nrw)`lS#EpLii6|&MhMwZGG6&av(l|otfv{kz<6BG{8kQ zljOzFvh2~V+C7CRYrW4TZpUY}z=xuhCk+?7r=n7~Ho-F9`_?DTY?*1sv6zVxU@ZtE zeW-dWm29W-IeGM-`)q1DYy?xX8B00aH0of(q7R4q?T1B`$$9%;r)LcpF;gNkEYmWP z=^@h@6PFU3+Ai4CG*{3BrXXXAT@Ea>B0swfG)d^FY89)v7{!qRq6S5g(a_@-^DGCs zgt^EkPKMGT@R1h?JFq<454>!t3;birPrBlD{;Q$QBnOVZJ~Z{cAV^(-z}G}1bOZ`a z&p{5!1C}$!+`!wgebN;0->})!tevW?Qze`{O??wtg4rk}4nvH%HgW5;*^77NIJ^}2Xg^)97zhtMJe-W>Eok18eu6?{50AvfmoT uJLBMY{`bYj_OG|!zVhv(H@}WG?XM@VU3~HVH=lJ|eYCqD|M0=1FaHI0>Fuxp literal 0 HcmV?d00001 diff --git a/build/chromium/resources/chrome/browser/download/internal/android/java/res/drawable-night/downloads_empty_state_illustration.xml b/browser/download/internal/android/java/res/drawable-night/downloads_empty_state_illustration.xml similarity index 100% rename from build/chromium/resources/chrome/browser/download/internal/android/java/res/drawable-night/downloads_empty_state_illustration.xml rename to browser/download/internal/android/java/res/drawable-night/downloads_empty_state_illustration.xml diff --git a/build/chromium/resources/chrome/browser/download/internal/android/java/res/drawable/downloads_empty_state_illustration.xml b/browser/download/internal/android/java/res/drawable/downloads_empty_state_illustration.xml similarity index 100% rename from build/chromium/resources/chrome/browser/download/internal/android/java/res/drawable/downloads_empty_state_illustration.xml rename to browser/download/internal/android/java/res/drawable/downloads_empty_state_illustration.xml diff --git a/build/chromium/resources/chrome/browser/download/internal/android/java/res/drawable/no_dynamic_download_search_bar_background.xml b/browser/download/internal/android/java/res/drawable/no_dynamic_download_search_bar_background.xml similarity index 100% rename from build/chromium/resources/chrome/browser/download/internal/android/java/res/drawable/no_dynamic_download_search_bar_background.xml rename to browser/download/internal/android/java/res/drawable/no_dynamic_download_search_bar_background.xml diff --git a/build/chromium/resources/chrome/browser/incognito/android/java/res/layout/incognito_reauth_view.xml b/browser/incognito/android/java/res/layout/incognito_reauth_view.xml similarity index 100% rename from build/chromium/resources/chrome/browser/incognito/android/java/res/layout/incognito_reauth_view.xml rename to browser/incognito/android/java/res/layout/incognito_reauth_view.xml diff --git a/browser/resources/chrome-logo-faded.png b/browser/resources/chrome-logo-faded.png new file mode 100644 index 0000000000000000000000000000000000000000..e860d66657e3677684436b41da3b73f1978e1dc7 GIT binary patch literal 2793 zcmVk%F=p~v|0U9QWNt%KALBSKCR$8a@Je`_CTHXt$!K{$zQdc)&} z;hf>Xwa$QxZs4ZzrMeiZ+C>0YD*>m=rFX9d5J^lfD~~A*IGgFw?L48_cpy# znC<~XiFJ<$790T190d;V1){nD>63w=29-J4z{w-P4;;Wl!+{sZ0iWztV5n^{0F_wA z)^oi4XwaZBot@4)t)wKU+;5<@<8J|mt3JG>aZQYn^7B)&MRfH)Qa*IQl=0M|t{xcc z{{*v_XiuG+WKVV3?P;mE8o$?h&G!%+x`GkOpvkWT-M$ADe*pabFM!6{pw}RJ!jnM9 zXrTHA@VE6qVZPZOIue-hEb!Yu15Z9`R$`L+njivglR^&Ua9$H4_bj{lRhEt?3@h|Z z0*2GLitJ1$QwUB>0a)O2`I%zGDIHjN zx^stsKdR>k(7~-hkA5aIraN$`fDoD(dL&o>j-hNF--jH5-5&m}8d3~(y6R8p62Ihx z7>ZQ#g&$!txBOgL)d{;jgAW1b&!5ltmuc$y@~ird68Zuu(H(-45*>#Q&4|)turTL3 zbKTo+UEj;+jArq8o*QO8b$`Zp8|T*Lo%b#X#x<{&E#=wA~+b>wAL$=y#`n~)7!T-0PN)iwB%3-aZD4TJxYpq@yhGhB|5Yd z*YG-x@_DeCP_RBP0VZ?5#I4&@ve3e5nVHG-mIHNLw%R?-j9!O->bMdZ&FD~ z-t>~<+=DAh})oeh-Iv(WI`N5*CtXgxp;}w0I z3BLEkz$-(571M#|ALFv=26pBQMfogu=R9lj)P51DLVuJPV@>{u%N-&kM->-uJ7zGQ><{m~;C`BP=Y; zB_LUWsHN$#ZQCTTCqQNFcDPbmF-7q$a?83IlnSL6ZHbF(TS`w{%yrZT2ZcX=;J}s& zOHSPj3i3)dVKZ_rLHo7u*qz!f$stOY3NwiwrKQDYGcpR8OQY|37g)pu{sh z`B(MNtEKam7G1np)tB?a_#&5`&gwU**HGd6Bh?`pqK@7ftHP`A#`2X5Y&Y9OjEPnr zv9$C}v0CQckpXm#=K+xglm&(w88plsSKgsWYdTzUL06Or%ie#h`>lvo@fV8E{L*FK zym`t_26gJ>GIqPwSNEjBkM&@zKT5+K=e2>xevR6P(-Uf0EUco@8g`XAD_DzM&7EIC zFnTdzk5t?*E9$4Re;=2>v#>Dl5W$EwrDYq2xx}U}ZoG2S>rf#r9fbP#x%`#Sa-X~5&eDG0Zn%w z#h`&c4;X0Nt#`57KmwEba^}~y@%Klbu_`nr%-uc0gDCq21=%%8jFMdA zET0+_iobeC8n@JE81C!@?s(V8k%Q(i@t*Jng9$f=UX!S13Y{NI8>oG|b}Cd=ac)XZ zPT{NcsGgL_FDck%y!-zBIcGV3o^$(KUS!R+?#aoic6#RSq@)q+Enai(RuE~9tRcfs zCn`x9JH<0;7>z%b-X9w7VHy98ytNEiKG)=_Cz*h(6X)@iSFmx5h8n>gn9GrB=8FYD z$VM8V+AW*|gj-*v48h&Gi3T1=qY1vaQT=u85*ncrzon78Tid?lfC_=_xskHMLV{QA z-MjsoeMo8yYP1xhu#n+LCPZ`6h}AAMx$R_700%6vY* zR%l|GhT!#W+C*Kfskt00rE?6!Dc8-&8zhHWKw5KecW;r07>YFPYNSw|K|b|5jxk<( z3V8n=uc!%z>NlS6l`>j9aP4B|&ZN<=@THgNvhJ)~uPrCYISLGdv^pXpa!SCoMqL7; zQ_nP24RJGM)z&$$B-ztkvIZ9j#@n>=ChB7ON6XRp=gTS?XHC)&qE59&wZ^^li7yyR zqNpf$pVYJr>b@j(Ip3|l|>YrTcgW0>G8G}!)`p6=Lf zYzSZBX0%%jh|(#?^FI-Z&20M5r~T29pG}S&2UOc4C8az>!>`2IhQpUN)_V7|fWJZg zhHl?sF5x)W!f#Z~Ow1VNW(rp`G8xW;cyoZa}2-dscX9bwmjo0Vg3{lGnMk34H!%DuDzCjDf vAET!niF`STpN0D3q>P8-8+`md^QivX00000NkvXXu0mjf8N_CA literal 0 HcmV?d00001 diff --git a/build/chromium/resources/chrome/browser/resources/side_panel/reading_list/images/read_later_empty.svg b/browser/resources/side_panel/reading_list/images/read_later_empty.svg similarity index 100% rename from build/chromium/resources/chrome/browser/resources/side_panel/reading_list/images/read_later_empty.svg rename to browser/resources/side_panel/reading_list/images/read_later_empty.svg diff --git a/build/chromium/resources/chrome/browser/resources/side_panel/reading_list/images/read_later_empty_dark.svg b/browser/resources/side_panel/reading_list/images/read_later_empty_dark.svg similarity index 100% rename from build/chromium/resources/chrome/browser/resources/side_panel/reading_list/images/read_later_empty_dark.svg rename to browser/resources/side_panel/reading_list/images/read_later_empty_dark.svg diff --git a/build/chromium/resources/chrome/browser/resources/signin/images/shared_left_banner.svg b/browser/resources/signin/images/shared_left_banner.svg similarity index 100% rename from build/chromium/resources/chrome/browser/resources/signin/images/shared_left_banner.svg rename to browser/resources/signin/images/shared_left_banner.svg diff --git a/build/chromium/resources/chrome/browser/resources/signin/images/shared_left_banner_dark.svg b/browser/resources/signin/images/shared_left_banner_dark.svg similarity index 100% rename from build/chromium/resources/chrome/browser/resources/signin/images/shared_left_banner_dark.svg rename to browser/resources/signin/images/shared_left_banner_dark.svg diff --git a/build/chromium/resources/chrome/browser/resources/signin/images/shared_right_banner.svg b/browser/resources/signin/images/shared_right_banner.svg similarity index 100% rename from build/chromium/resources/chrome/browser/resources/signin/images/shared_right_banner.svg rename to browser/resources/signin/images/shared_right_banner.svg diff --git a/build/chromium/resources/chrome/browser/resources/signin/images/shared_right_banner_dark.svg b/browser/resources/signin/images/shared_right_banner_dark.svg similarity index 100% rename from build/chromium/resources/chrome/browser/resources/signin/images/shared_right_banner_dark.svg rename to browser/resources/signin/images/shared_right_banner_dark.svg diff --git a/build/chromium/resources/chrome/browser/resources/signin/profile_customization/images/profile_customization_illustration.svg b/browser/resources/signin/profile_customization/images/profile_customization_illustration.svg similarity index 100% rename from build/chromium/resources/chrome/browser/resources/signin/profile_customization/images/profile_customization_illustration.svg rename to browser/resources/signin/profile_customization/images/profile_customization_illustration.svg diff --git a/build/chromium/resources/chrome/browser/resources/signin/profile_customization/images/profile_customization_illustration_dark.svg b/browser/resources/signin/profile_customization/images/profile_customization_illustration_dark.svg similarity index 100% rename from build/chromium/resources/chrome/browser/resources/signin/profile_customization/images/profile_customization_illustration_dark.svg rename to browser/resources/signin/profile_customization/images/profile_customization_illustration_dark.svg diff --git a/browser/resources/signin/profile_picker/images/dark_mode_left_banner_image.svg b/browser/resources/signin/profile_picker/images/dark_mode_left_banner_image.svg new file mode 100644 index 00000000000..45653dafe9c --- /dev/null +++ b/browser/resources/signin/profile_picker/images/dark_mode_left_banner_image.svg @@ -0,0 +1 @@ + diff --git a/browser/resources/signin/profile_picker/images/dark_mode_right_banner_image.svg b/browser/resources/signin/profile_picker/images/dark_mode_right_banner_image.svg new file mode 100644 index 00000000000..45653dafe9c --- /dev/null +++ b/browser/resources/signin/profile_picker/images/dark_mode_right_banner_image.svg @@ -0,0 +1 @@ + diff --git a/browser/resources/signin/profile_picker/images/left_banner_image.svg b/browser/resources/signin/profile_picker/images/left_banner_image.svg new file mode 100644 index 00000000000..ad79a04b6b5 --- /dev/null +++ b/browser/resources/signin/profile_picker/images/left_banner_image.svg @@ -0,0 +1 @@ + diff --git a/browser/resources/signin/profile_picker/images/right_banner_image.svg b/browser/resources/signin/profile_picker/images/right_banner_image.svg new file mode 100644 index 00000000000..ad79a04b6b5 --- /dev/null +++ b/browser/resources/signin/profile_picker/images/right_banner_image.svg @@ -0,0 +1 @@ + diff --git a/build/chromium/resources/chrome/browser/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml b/browser/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml similarity index 100% rename from build/chromium/resources/chrome/browser/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml rename to browser/safe_browsing/android/java/res/xml/safe_browsing_preferences.xml diff --git a/build/chromium/resources/chrome/browser/touch_to_fill/password_manager/android/internal/java/res/layout/touch_to_fill_header_item.xml b/browser/touch_to_fill/password_manager/android/internal/java/res/layout/touch_to_fill_header_item.xml similarity index 100% rename from build/chromium/resources/chrome/browser/touch_to_fill/password_manager/android/internal/java/res/layout/touch_to_fill_header_item.xml rename to browser/touch_to_fill/password_manager/android/internal/java/res/layout/touch_to_fill_header_item.xml diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-hdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-hdpi/btn_toolbar_reload.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-hdpi/btn_toolbar_reload.png rename to browser/ui/android/toolbar/java/res/drawable-hdpi/btn_toolbar_reload.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-hdpi/incognito_simple.png b/browser/ui/android/toolbar/java/res/drawable-hdpi/incognito_simple.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-hdpi/incognito_simple.png rename to browser/ui/android/toolbar/java/res/drawable-hdpi/incognito_simple.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-hdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-ldrtl-hdpi/btn_toolbar_reload.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-hdpi/btn_toolbar_reload.png rename to browser/ui/android/toolbar/java/res/drawable-ldrtl-hdpi/btn_toolbar_reload.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-mdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-ldrtl-mdpi/btn_toolbar_reload.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-mdpi/btn_toolbar_reload.png rename to browser/ui/android/toolbar/java/res/drawable-ldrtl-mdpi/btn_toolbar_reload.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-xhdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-ldrtl-xhdpi/btn_toolbar_reload.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-xhdpi/btn_toolbar_reload.png rename to browser/ui/android/toolbar/java/res/drawable-ldrtl-xhdpi/btn_toolbar_reload.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-xxhdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-ldrtl-xxhdpi/btn_toolbar_reload.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-xxhdpi/btn_toolbar_reload.png rename to browser/ui/android/toolbar/java/res/drawable-ldrtl-xxhdpi/btn_toolbar_reload.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-xxxhdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-ldrtl-xxxhdpi/btn_toolbar_reload.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-ldrtl-xxxhdpi/btn_toolbar_reload.png rename to browser/ui/android/toolbar/java/res/drawable-ldrtl-xxxhdpi/btn_toolbar_reload.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-mdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-mdpi/btn_toolbar_reload.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-mdpi/btn_toolbar_reload.png rename to browser/ui/android/toolbar/java/res/drawable-mdpi/btn_toolbar_reload.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-mdpi/incognito_simple.png b/browser/ui/android/toolbar/java/res/drawable-mdpi/incognito_simple.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-mdpi/incognito_simple.png rename to browser/ui/android/toolbar/java/res/drawable-mdpi/incognito_simple.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xhdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-xhdpi/btn_toolbar_reload.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xhdpi/btn_toolbar_reload.png rename to browser/ui/android/toolbar/java/res/drawable-xhdpi/btn_toolbar_reload.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xhdpi/incognito_simple.png b/browser/ui/android/toolbar/java/res/drawable-xhdpi/incognito_simple.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xhdpi/incognito_simple.png rename to browser/ui/android/toolbar/java/res/drawable-xhdpi/incognito_simple.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxhdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-xxhdpi/btn_toolbar_reload.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxhdpi/btn_toolbar_reload.png rename to browser/ui/android/toolbar/java/res/drawable-xxhdpi/btn_toolbar_reload.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxhdpi/incognito_simple.png b/browser/ui/android/toolbar/java/res/drawable-xxhdpi/incognito_simple.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxhdpi/incognito_simple.png rename to browser/ui/android/toolbar/java/res/drawable-xxhdpi/incognito_simple.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxxhdpi/btn_toolbar_reload.png b/browser/ui/android/toolbar/java/res/drawable-xxxhdpi/btn_toolbar_reload.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxxhdpi/btn_toolbar_reload.png rename to browser/ui/android/toolbar/java/res/drawable-xxxhdpi/btn_toolbar_reload.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxxhdpi/incognito_simple.png b/browser/ui/android/toolbar/java/res/drawable-xxxhdpi/incognito_simple.png similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/drawable-xxxhdpi/incognito_simple.png rename to browser/ui/android/toolbar/java/res/drawable-xxxhdpi/incognito_simple.png diff --git a/build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/layout/bottom_control_container.xml b/browser/ui/android/toolbar/java/res/layout/bottom_control_container.xml similarity index 100% rename from build/chromium/resources/chrome/browser/ui/android/toolbar/java/res/layout/bottom_control_container.xml rename to browser/ui/android/toolbar/java/res/layout/bottom_control_container.xml diff --git a/build/chromium/resources/README.md b/build/chromium/resources/README.md deleted file mode 100644 index 199964e99fc..00000000000 --- a/build/chromium/resources/README.md +++ /dev/null @@ -1 +0,0 @@ -This directory contains resource files that should overwrite upstream. It is for resource files only (jpg, svg, xml, etc...) diff --git a/build/commands/lib/branding.js b/build/commands/lib/branding.js index 853a214abcb..c805dd2b465 100644 --- a/build/commands/lib/branding.js +++ b/build/commands/lib/branding.js @@ -16,10 +16,15 @@ exports.update = () => { const braveComponentsDir = path.join(config.braveCoreDir, 'components') const chromeAppDir = path.join(config.srcDir, 'chrome', 'app') const braveAppDir = path.join(config.braveCoreDir, 'app') - const braveChromiumResources = path.join( + const chromeBrowserResourcesDir = path.join( + config.srcDir, + 'chrome', + 'browser', + 'resources', + ) + const braveBrowserResourcesDir = path.join( config.braveCoreDir, - 'build', - 'chromium', + 'browser', 'resources', ) const braveAppVectorIconsDir = path.join(config.braveCoreDir, 'components') @@ -118,7 +123,14 @@ exports.update = () => { ]) } } - fileMap.add([path.join(braveChromiumResources), path.join(config.srcDir)]) + fileMap.add([ + path.join(braveAppDir, 'theme', 'default_100_percent', 'common'), + path.join(chromeAppDir, 'theme', 'default_100_percent', 'common'), + ]) + fileMap.add([ + path.join(braveAppDir, 'theme', 'default_200_percent', 'common'), + path.join(chromeAppDir, 'theme', 'default_200_percent', 'common'), + ]) // Copy product_logo for version UI (about:version page). // product_logo_name_48.png is renamed to product_logo.png during copy. // Use brave_origin logos when is_brave_origin_branded is true. @@ -159,12 +171,95 @@ exports.update = () => { ), ]) } + // Replace history page's favicon. + fileMap.add([ + path.join( + braveComponentsDir, + 'resources', + 'default_100_percent', + 'favicon_history.png', + ), + path.join( + chromeComponentsDir, + 'resources', + 'default_100_percent', + 'favicon_history.png', + ), + ]) + fileMap.add([ + path.join( + braveComponentsDir, + 'resources', + 'default_200_percent', + 'favicon_history.png', + ), + path.join( + chromeComponentsDir, + 'resources', + 'default_200_percent', + 'favicon_history.png', + ), + ]) for (const branding of ['brave', 'brave_origin']) { fileMap.add([ path.join(braveAppVectorIconsDir, 'vector_icons', branding), path.join(chromeComponentsDir, 'vector_icons', branding), ]) } + // Copy chrome-logo-faded.png for replacing chrome logo of welcome page with brave's on Win8. + fileMap.add([ + path.join(braveBrowserResourcesDir, 'chrome-logo-faded.png'), + path.join(chromeBrowserResourcesDir, 'chrome-logo-faded.png'), + ]) + fileMap.add([ + path.join( + braveBrowserResourcesDir, + 'downloads', + 'images', + 'incognito_marker.svg', + ), + path.join( + chromeBrowserResourcesDir, + 'downloads', + 'images', + 'incognito_marker.svg', + ), + ]) + fileMap.add([ + path.join(braveBrowserResourcesDir, 'settings', 'images'), + path.join(chromeBrowserResourcesDir, 'settings', 'images'), + ]) + fileMap.add([ + path.join(braveBrowserResourcesDir, 'signin', 'images'), + path.join(chromeBrowserResourcesDir, 'signin', 'images'), + ]) + fileMap.add([ + path.join( + braveBrowserResourcesDir, + 'signin', + 'profile_customization', + 'images', + ), + path.join( + chromeBrowserResourcesDir, + 'signin', + 'profile_customization', + 'images', + ), + ]) + fileMap.add([ + path.join(braveBrowserResourcesDir, 'signin', 'profile_picker', 'images'), + path.join(chromeBrowserResourcesDir, 'signin', 'profile_picker', 'images'), + ]) + fileMap.add([ + path.join(braveBrowserResourcesDir, 'side_panel', 'reading_list', 'images'), + path.join( + chromeBrowserResourcesDir, + 'side_panel', + 'reading_list', + 'images', + ), + ]) // Copy to make our ${branding_path_product}_behaviors.cc fileMap.add([ @@ -328,9 +423,6 @@ exports.update = () => { } for (let sourceFile of sourceFiles) { - if (path.basename(sourceFile) === 'README.md') { - continue - } const destinationFile = path.join( output, path.relative(source, sourceFile), @@ -405,15 +497,20 @@ exports.update = () => { androidIconSet = 'res_brave_nightly' } - const androidResSource = path.join( + const androidTranslateResSource = path.join( config.braveCoreDir, + 'components', + 'translate', + 'content', 'android', 'java', 'res', ) - const androidResDest = path.join( + const androidTranslateResDest = path.join( config.srcDir, - 'chrome', + 'components', + 'translate', + 'content', 'android', 'java', 'res', @@ -446,12 +543,246 @@ exports.update = () => { 'java', 'res_chromium_base', ) + const androidResSource = path.join( + config.braveCoreDir, + 'android', + 'java', + 'res', + ) + const androidResDest = path.join( + config.srcDir, + 'chrome', + 'android', + 'java', + 'res', + ) + const androidResTemplateSource = path.join( + config.braveCoreDir, + 'android', + 'java', + 'res_template', + ) + const androidResTemplateDest = path.join( + config.srcDir, + 'chrome', + 'android', + 'java', + 'res_template', + ) + const androidContentPublicResSource = path.join( + config.braveCoreDir, + 'content', + 'public', + 'android', + 'java', + 'res', + ) + const androidContentPublicResDest = path.join( + config.srcDir, + 'content', + 'public', + 'android', + 'java', + 'res', + ) + const androidTouchtoFillResSource = path.join( + config.braveCoreDir, + 'browser', + 'touch_to_fill', + 'password_manager', + 'android', + 'internal', + 'java', + 'res', + ) + const androidTouchtoFillResDest = path.join( + config.srcDir, + 'chrome', + 'browser', + 'touch_to_fill', + 'password_manager', + 'android', + 'internal', + 'java', + 'res', + ) + const androidToolbarResSource = path.join( + config.braveCoreDir, + 'browser', + 'ui', + 'android', + 'toolbar', + 'java', + 'res', + ) + const androidToolbarResDest = path.join( + config.srcDir, + 'chrome', + 'browser', + 'ui', + 'android', + 'toolbar', + 'java', + 'res', + ) + const androidComponentsWidgetResSource = path.join( + config.braveCoreDir, + 'components', + 'browser_ui', + 'widget', + 'android', + 'java', + 'res', + ) + const androidComponentsWidgetResDest = path.join( + config.srcDir, + 'components', + 'browser_ui', + 'widget', + 'android', + 'java', + 'res', + ) + const androidComponentsStylesResSource = path.join( + config.braveCoreDir, + 'components', + 'browser_ui', + 'styles', + 'android', + 'java', + 'res', + ) + const androidComponentsStylesResDest = path.join( + config.srcDir, + 'components', + 'browser_ui', + 'styles', + 'android', + 'java', + 'res', + ) + const androidSafeBrowsingResSource = path.join( + config.braveCoreDir, + 'browser', + 'safe_browsing', + 'android', + 'java', + 'res', + ) + const androidSafeBrowsingResDest = path.join( + config.srcDir, + 'chrome', + 'browser', + 'safe_browsing', + 'android', + 'java', + 'res', + ) + const androidDownloadInternalResSource = path.join( + config.braveCoreDir, + 'browser', + 'download', + 'internal', + 'android', + 'java', + 'res', + ) + const androidDownloadInternalResDest = path.join( + config.srcDir, + 'chrome', + 'browser', + 'download', + 'internal', + 'android', + 'java', + 'res', + ) + const androidFeaturesTabUiResSource = path.join( + config.braveCoreDir, + 'android', + 'features', + 'tab_ui', + 'java', + 'res', + ) + const androidFeaturesTabUiDest = path.join( + config.srcDir, + 'chrome', + 'android', + 'features', + 'tab_ui', + 'java', + 'res', + ) + const androidComponentsOmniboxResSource = path.join( + config.braveCoreDir, + 'components', + 'omnibox', + 'browser', + 'android', + 'java', + 'res', + ) + const androidComponentsOmniboxResDest = path.join( + config.srcDir, + 'components', + 'omnibox', + 'browser', + 'android', + 'java', + 'res', + ) + const androidBrowserPrivateResSource = path.join( + config.braveCoreDir, + 'browser', + 'incognito', + 'android', + 'java', + 'res', + ) + const androidBrowserPrivateResDest = path.join( + config.srcDir, + 'chrome', + 'browser', + 'incognito', + 'android', + 'java', + 'res', + ) + + const uiAndroidResSource = path.join( + config.braveCoreDir, + 'ui', + 'android', + 'java', + 'res', + ) + const uiAndroidResDest = path.join( + config.srcDir, + 'ui', + 'android', + 'java', + 'res', + ) // Mapping for copying Brave's Android resource into chromium folder. const copyAndroidResourceMapping = { - [androidResSource]: [androidResDest], + [androidTranslateResSource]: [androidTranslateResDest], [androidIconSource]: [androidIconDest], [androidIconBaseSource]: [androidIconBaseDest], + [androidResSource]: [androidResDest], + [androidResTemplateSource]: [androidResTemplateDest], + [androidContentPublicResSource]: [androidContentPublicResDest], + [androidTouchtoFillResSource]: [androidTouchtoFillResDest], + [androidToolbarResSource]: [androidToolbarResDest], + [androidComponentsWidgetResSource]: [androidComponentsWidgetResDest], + [androidComponentsStylesResSource]: [androidComponentsStylesResDest], + [androidSafeBrowsingResSource]: [androidSafeBrowsingResDest], + [androidDownloadInternalResSource]: [androidDownloadInternalResDest], + [androidFeaturesTabUiResSource]: [androidFeaturesTabUiDest], + [androidComponentsOmniboxResSource]: [androidComponentsOmniboxResDest], + [androidBrowserPrivateResSource]: [androidBrowserPrivateResDest], + [uiAndroidResSource]: [uiAndroidResDest], } console.log('copy Android app icons and app resources') diff --git a/build/chromium/resources/components/browser_ui/styles/android/java/res/color/default_text_color_on_accent1_list.xml b/components/browser_ui/styles/android/java/res/color/default_text_color_on_accent1_list.xml similarity index 100% rename from build/chromium/resources/components/browser_ui/styles/android/java/res/color/default_text_color_on_accent1_list.xml rename to components/browser_ui/styles/android/java/res/color/default_text_color_on_accent1_list.xml diff --git a/build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/ic_desktop_windows.xml b/components/browser_ui/styles/android/java/res/drawable/ic_desktop_windows.xml similarity index 100% rename from build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/ic_desktop_windows.xml rename to components/browser_ui/styles/android/java/res/drawable/ic_desktop_windows.xml diff --git a/build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/ic_keep_24dp.xml b/components/browser_ui/styles/android/java/res/drawable/ic_keep_24dp.xml similarity index 100% rename from build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/ic_keep_24dp.xml rename to components/browser_ui/styles/android/java/res/drawable/ic_keep_24dp.xml diff --git a/build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/ic_keep_off_24dp.xml b/components/browser_ui/styles/android/java/res/drawable/ic_keep_off_24dp.xml similarity index 100% rename from build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/ic_keep_off_24dp.xml rename to components/browser_ui/styles/android/java/res/drawable/ic_keep_off_24dp.xml diff --git a/build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/star_outline_24dp.xml b/components/browser_ui/styles/android/java/res/drawable/star_outline_24dp.xml similarity index 100% rename from build/chromium/resources/components/browser_ui/styles/android/java/res/drawable/star_outline_24dp.xml rename to components/browser_ui/styles/android/java/res/drawable/star_outline_24dp.xml diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/color/home_surface_background_color.xml b/components/browser_ui/widget/android/java/res/color/home_surface_background_color.xml similarity index 100% rename from build/chromium/resources/components/browser_ui/widget/android/java/res/color/home_surface_background_color.xml rename to components/browser_ui/widget/android/java/res/color/home_surface_background_color.xml diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-hdpi/btn_info.png b/components/browser_ui/widget/android/java/res/drawable-hdpi/btn_info.png similarity index 100% rename from build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-hdpi/btn_info.png rename to components/browser_ui/widget/android/java/res/drawable-hdpi/btn_info.png diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-mdpi/btn_info.png b/components/browser_ui/widget/android/java/res/drawable-mdpi/btn_info.png similarity index 100% rename from build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-mdpi/btn_info.png rename to components/browser_ui/widget/android/java/res/drawable-mdpi/btn_info.png diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-xhdpi/btn_info.png b/components/browser_ui/widget/android/java/res/drawable-xhdpi/btn_info.png similarity index 100% rename from build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-xhdpi/btn_info.png rename to components/browser_ui/widget/android/java/res/drawable-xhdpi/btn_info.png diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-xxhdpi/btn_info.png b/components/browser_ui/widget/android/java/res/drawable-xxhdpi/btn_info.png similarity index 100% rename from build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-xxhdpi/btn_info.png rename to components/browser_ui/widget/android/java/res/drawable-xxhdpi/btn_info.png diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-xxxhdpi/btn_info.png b/components/browser_ui/widget/android/java/res/drawable-xxxhdpi/btn_info.png similarity index 100% rename from build/chromium/resources/components/browser_ui/widget/android/java/res/drawable-xxxhdpi/btn_info.png rename to components/browser_ui/widget/android/java/res/drawable-xxxhdpi/btn_info.png diff --git a/build/chromium/resources/components/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml b/components/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml similarity index 100% rename from build/chromium/resources/components/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml rename to components/browser_ui/widget/android/java/res/drawable/modern_toolbar_tablet_text_box_background.xml diff --git a/build/chromium/resources/components/omnibox/browser/android/java/res/drawable/ic_settings_tune_24dp.xml b/components/omnibox/browser/android/java/res/drawable/ic_settings_tune_24dp.xml similarity index 100% rename from build/chromium/resources/components/omnibox/browser/android/java/res/drawable/ic_settings_tune_24dp.xml rename to components/omnibox/browser/android/java/res/drawable/ic_settings_tune_24dp.xml diff --git a/build/chromium/resources/components/resources/default_100_percent/favicon_history.png b/components/resources/default_100_percent/favicon_history.png similarity index 100% rename from build/chromium/resources/components/resources/default_100_percent/favicon_history.png rename to components/resources/default_100_percent/favicon_history.png diff --git a/build/chromium/resources/components/resources/default_200_percent/favicon_history.png b/components/resources/default_200_percent/favicon_history.png similarity index 100% rename from build/chromium/resources/components/resources/default_200_percent/favicon_history.png rename to components/resources/default_200_percent/favicon_history.png diff --git a/build/chromium/resources/components/translate/content/android/java/res/drawable-hdpi/infobar_translate_compact.png b/components/translate/content/android/java/res/drawable-hdpi/infobar_translate_compact.png similarity index 100% rename from build/chromium/resources/components/translate/content/android/java/res/drawable-hdpi/infobar_translate_compact.png rename to components/translate/content/android/java/res/drawable-hdpi/infobar_translate_compact.png diff --git a/build/chromium/resources/components/translate/content/android/java/res/drawable-mdpi/infobar_translate_compact.png b/components/translate/content/android/java/res/drawable-mdpi/infobar_translate_compact.png similarity index 100% rename from build/chromium/resources/components/translate/content/android/java/res/drawable-mdpi/infobar_translate_compact.png rename to components/translate/content/android/java/res/drawable-mdpi/infobar_translate_compact.png diff --git a/build/chromium/resources/components/translate/content/android/java/res/drawable-xhdpi/infobar_translate_compact.png b/components/translate/content/android/java/res/drawable-xhdpi/infobar_translate_compact.png similarity index 100% rename from build/chromium/resources/components/translate/content/android/java/res/drawable-xhdpi/infobar_translate_compact.png rename to components/translate/content/android/java/res/drawable-xhdpi/infobar_translate_compact.png diff --git a/build/chromium/resources/components/translate/content/android/java/res/drawable-xxhdpi/infobar_translate_compact.png b/components/translate/content/android/java/res/drawable-xxhdpi/infobar_translate_compact.png similarity index 100% rename from build/chromium/resources/components/translate/content/android/java/res/drawable-xxhdpi/infobar_translate_compact.png rename to components/translate/content/android/java/res/drawable-xxhdpi/infobar_translate_compact.png diff --git a/build/chromium/resources/components/translate/content/android/java/res/drawable-xxxhdpi/infobar_translate_compact.png b/components/translate/content/android/java/res/drawable-xxxhdpi/infobar_translate_compact.png similarity index 100% rename from build/chromium/resources/components/translate/content/android/java/res/drawable-xxxhdpi/infobar_translate_compact.png rename to components/translate/content/android/java/res/drawable-xxxhdpi/infobar_translate_compact.png diff --git a/build/chromium/resources/content/public/android/java/res/drawable-hdpi/ic_search.png b/content/public/android/java/res/drawable-hdpi/ic_search.png similarity index 100% rename from build/chromium/resources/content/public/android/java/res/drawable-hdpi/ic_search.png rename to content/public/android/java/res/drawable-hdpi/ic_search.png diff --git a/build/chromium/resources/content/public/android/java/res/drawable-mdpi/ic_search.png b/content/public/android/java/res/drawable-mdpi/ic_search.png similarity index 100% rename from build/chromium/resources/content/public/android/java/res/drawable-mdpi/ic_search.png rename to content/public/android/java/res/drawable-mdpi/ic_search.png diff --git a/build/chromium/resources/content/public/android/java/res/drawable-xhdpi/ic_search.png b/content/public/android/java/res/drawable-xhdpi/ic_search.png similarity index 100% rename from build/chromium/resources/content/public/android/java/res/drawable-xhdpi/ic_search.png rename to content/public/android/java/res/drawable-xhdpi/ic_search.png diff --git a/build/chromium/resources/content/public/android/java/res/drawable-xxhdpi/ic_search.png b/content/public/android/java/res/drawable-xxhdpi/ic_search.png similarity index 100% rename from build/chromium/resources/content/public/android/java/res/drawable-xxhdpi/ic_search.png rename to content/public/android/java/res/drawable-xxhdpi/ic_search.png diff --git a/build/chromium/resources/content/public/android/java/res/drawable-xxxhdpi/ic_search.png b/content/public/android/java/res/drawable-xxxhdpi/ic_search.png similarity index 100% rename from build/chromium/resources/content/public/android/java/res/drawable-xxxhdpi/ic_search.png rename to content/public/android/java/res/drawable-xxxhdpi/ic_search.png diff --git a/build/chromium/resources/ui/android/java/res/drawable-hdpi/btn_close.png b/ui/android/java/res/drawable-hdpi/btn_close.png similarity index 100% rename from build/chromium/resources/ui/android/java/res/drawable-hdpi/btn_close.png rename to ui/android/java/res/drawable-hdpi/btn_close.png diff --git a/build/chromium/resources/ui/android/java/res/drawable-mdpi/btn_close.png b/ui/android/java/res/drawable-mdpi/btn_close.png similarity index 100% rename from build/chromium/resources/ui/android/java/res/drawable-mdpi/btn_close.png rename to ui/android/java/res/drawable-mdpi/btn_close.png diff --git a/build/chromium/resources/ui/android/java/res/drawable-xhdpi/btn_close.png b/ui/android/java/res/drawable-xhdpi/btn_close.png similarity index 100% rename from build/chromium/resources/ui/android/java/res/drawable-xhdpi/btn_close.png rename to ui/android/java/res/drawable-xhdpi/btn_close.png diff --git a/build/chromium/resources/ui/android/java/res/drawable-xxhdpi/btn_close.png b/ui/android/java/res/drawable-xxhdpi/btn_close.png similarity index 100% rename from build/chromium/resources/ui/android/java/res/drawable-xxhdpi/btn_close.png rename to ui/android/java/res/drawable-xxhdpi/btn_close.png diff --git a/build/chromium/resources/ui/android/java/res/drawable-xxxhdpi/btn_close.png b/ui/android/java/res/drawable-xxxhdpi/btn_close.png similarity index 100% rename from build/chromium/resources/ui/android/java/res/drawable-xxxhdpi/btn_close.png rename to ui/android/java/res/drawable-xxxhdpi/btn_close.png