diff --git a/android/brave_java_resources.gni b/android/brave_java_resources.gni new file mode 100644 index 000000000000..4af28eb8056c --- /dev/null +++ b/android/brave_java_resources.gni @@ -0,0 +1,722 @@ +# Copyright 2020 The Brave Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. + +# See 'chrome/android/chrome_java_resources.gni' on how to generate this list +brave_java_resources = [ + "java/res/anim/activity_fade_in.xml", + "java/res/anim/cycle.xml", + "java/res/anim/activity_fade_out.xml", + "java/res/anim/shake.xml", + "java/res/drawable/radio_button_selected_bg.xml", + "java/res/drawable/bat_panel_gradient.xml", + "java/res/drawable/brave_sync_btn.xml", + "java/res/drawable/brave_sync_cover_general.xml", + "java/res/drawable/rewards_button_summary.xml", + "java/res/drawable/brave_rewards_not_verified_rectangle.xml", + "java/res/drawable/blue_rounded_button.xml", + "java/res/drawable/rewards_button.xml", + "java/res/drawable/brave_sync_qr_rounded.xml", + "java/res/drawable/brave_sync_image_btn.xml", + "java/res/drawable/brave_sync_toggle_off_btn_right.xml", + "java/res/drawable/rewards_image_button.xml", + "java/res/drawable/rewards_button_purple_border.xml", + "java/res/drawable/ic_toggle_up.xml", + "java/res/drawable/rounded_filled.xml", + "java/res/drawable/rounded_shape.xml", + "java/res/drawable/brave_badge_rewards_background_large.xml", + "java/res/drawable/rewards_button_orange.xml", + "java/res/drawable/progress_indeterminate_orange.xml", + "java/res/drawable/radiobutton_background.xml", + "java/res/drawable/transparent_bg_bordered.xml", + "java/res/drawable/ic_back.xml", + "java/res/drawable/brave_badge_shields_background_large.xml", + "java/res/drawable/brave_sync_toggle_off_btn_left.xml", + "java/res/drawable/brave_gradient_shadow.xml", + "java/res/drawable/ic_toggle_down.xml", + "java/res/drawable/brave_modern_toolbar_text_box_background.xml", + "java/res/drawable/ic_thank_you.xml", + "java/res/drawable/brave_rewards_circle.xml", + "java/res/drawable/tip_amount.xml", + "java/res/drawable/brave_sync_toggle_on_btn_right.xml", + "java/res/drawable/brave_rewards_rectangle.xml", + "java/res/drawable/brave_rewards_loader.xml", + "java/res/drawable/brave_badge_shields_background_small.xml", + "java/res/drawable/modern_toolbar_background_grey_end_segment.xml", + "java/res/drawable/orange_rounded_button.xml", + "java/res/drawable/wallet_disconnected_button.xml", + "java/res/drawable/publisher_favicon_background.xml", + "java/res/drawable/brave_sync_toggle_on_btn_left.xml", + "java/res/drawable/brave_sync_top_rounded.xml", + "java/res/drawable/rate_feedback_background.xml", + "java/res/drawable/brave_badge_rewards_background_small.xml", + "java/res/drawable/circular_progress.xml", + "java/res/drawable/rounded_corners.xml", + "java/res/drawable/bat_rewards_summary_gradient.xml", + "java/res/drawable/ic_chevron_right.xml", + "java/res/drawable/rounded_holo.xml", + "java/res/drawable/wallet_verify_button.xml", + "java/res/drawable/ic_help.xml", + "java/res/drawable/plain_checkbox.xml", + "java/res/drawable/rect_round_corners_12.xml", + "java/res/drawable/progress_indeterminate.xml", + "java/res/drawable/image_credit_rounded_shape.xml", + "java/res/drawable/rect_up_round_corners_12.xml", + "java/res/drawable/enable_rewards_button.xml", + "java/res/drawable-hdpi/check.png", + "java/res/drawable-hdpi/btn_bookmark.png", + "java/res/drawable-hdpi/arrow_forward.png", + "java/res/drawable-hdpi/camera.png", + "java/res/drawable-hdpi/slide_up.png", + "java/res/drawable-hdpi/brave_ads_launch_graphic.png", + "java/res/drawable-hdpi/shortcut_incognito.png", + "java/res/drawable-hdpi/smiley_sad.png", + "java/res/drawable-hdpi/header.png", + "java/res/drawable-hdpi/changetip_icon.png", + "java/res/drawable-hdpi/uphold_white.png", + "java/res/drawable-hdpi/down_icon.png", + "java/res/drawable-hdpi/btn_toolbar_reload.png", + "java/res/drawable-hdpi/plus.png", + "java/res/drawable-hdpi/cover_photo.png", + "java/res/drawable-hdpi/icn_unverified_alert.png", + "java/res/drawable-hdpi/slide_down.png", + "java/res/drawable-hdpi/ic_expand_less_black_24dp.png", + "java/res/drawable-hdpi/chromelogo16.png", + "java/res/drawable-hdpi/settings_play_yt_video_in_browser.png", + "java/res/drawable-hdpi/disclosure.png", + "java/res/drawable-hdpi/plane_small.png", + "java/res/drawable-hdpi/location_bar_incognito_badge.png", + "java/res/drawable-hdpi/up_icon.png", + "java/res/drawable-hdpi/checkbox.png", + "java/res/drawable-hdpi/android_onboarding_4.png", + "java/res/drawable-hdpi/icon_error_notification.png", + "java/res/drawable-hdpi/ic_delete_white_24dp.png", + "java/res/drawable-hdpi/checkbox_checked.png", + "java/res/drawable-hdpi/btn_info.png", + "java/res/drawable-hdpi/bat_logo.png", + "java/res/drawable-hdpi/chevron_right.png", + "java/res/drawable-hdpi/search_engine_duckduckgo_lite.png", + "java/res/drawable-hdpi/brave_sync.png", + "java/res/drawable-hdpi/wallet_add.png", + "java/res/drawable-hdpi/btn_suggestion_refine.png", + "java/res/drawable-hdpi/notification_icon.png", + "java/res/drawable-hdpi/icon_warning_notification.png", + "java/res/drawable-hdpi/verified_disclosure.png", + "java/res/drawable-hdpi/search_engine_qwant.png", + "java/res/drawable-hdpi/notification_header_error.png", + "java/res/drawable-hdpi/notification_header.png", + "java/res/drawable-hdpi/grant_icon.png", + "java/res/drawable-hdpi/settings_desktop_mode.png", + "java/res/drawable-hdpi/verified_creator_large.png", + "java/res/drawable-hdpi/btn_star.png", + "java/res/drawable-hdpi/copy_paste.png", + "java/res/drawable-hdpi/omnibox_https_invalid_red.png", + "java/res/drawable-hdpi/group.png", + "java/res/drawable-hdpi/icn_twitter.png", + "java/res/drawable-hdpi/brave_sync_btn_laptop.png", + "java/res/drawable-hdpi/icon_validated_notification.png", + "java/res/drawable-hdpi/ic_file_download_white_24dp.png", + "java/res/drawable-hdpi/icon_close_notification.png", + "java/res/drawable-hdpi/icn_frowning_face.png", + "java/res/drawable-hdpi/contribute_icon.png", + "java/res/drawable-hdpi/bat_outline.png", + "java/res/drawable-hdpi/btn_bookmark_fill.png", + "java/res/drawable-hdpi/btn_delete_24dp.png", + "java/res/drawable-hdpi/incognito_splash.png", + "java/res/drawable-hdpi/btn_left.png", + "java/res/drawable-hdpi/brave_sync_btn_mobile.png", + "java/res/drawable-hdpi/android_onboarding_2.png", + "java/res/drawable-hdpi/wallet_withdraw.png", + "java/res/drawable-hdpi/btn_bat.png", + "java/res/drawable-hdpi/duckduckgo.png", + "java/res/drawable-hdpi/btn_toolbar_home.png", + "java/res/drawable-hdpi/notification_header_normal.png", + "java/res/drawable-hdpi/btn_tabstrip_switch_normal.png", + "java/res/drawable-hdpi/rewards_settings.png", + "java/res/drawable-hdpi/add_funds.png", + "java/res/drawable-hdpi/incognito_simple.png", + "java/res/drawable-hdpi/search_engine_google.png", + "java/res/drawable-hdpi/uphold_green.png", + "java/res/drawable-hdpi/btn_mic.png", + "java/res/drawable-hdpi/btn_star_filled.png", + "java/res/drawable-hdpi/ic_chrome.png", + "java/res/drawable-hdpi/smiley_neutral.png", + "java/res/drawable-hdpi/modern_location_bar.9.png", + "java/res/drawable-hdpi/btn_brave.png", + "java/res/drawable-hdpi/search_engine_startpage.png", + "java/res/drawable-hdpi/btn_brave_off.png", + "java/res/drawable-hdpi/qrcode_dark.png", + "java/res/drawable-hdpi/android_br_on.png", + "java/res/drawable-hdpi/coin_stack.png", + "java/res/drawable-hdpi/android_onboarding_3.png", + "java/res/drawable-hdpi/btn_tabswitcher_modern.png", + "java/res/drawable-hdpi/qrcode_light.png", + "java/res/drawable-hdpi/down_arrow.png", + "java/res/drawable-hdpi/icn_youtube.png", + "java/res/drawable-hdpi/android_onboarding_1.png", + "java/res/drawable-hdpi/bat_verified.png", + "java/res/drawable-hdpi/ic_expand_more_black_24dp.png", + "java/res/drawable-hdpi/omnibox_info_red.png", + "java/res/drawable-hdpi/icn_twitch.png", + "java/res/drawable-hdpi/btn_right_tablet.png", + "java/res/drawable-hdpi/brave_onboarding.png", + "java/res/drawable-hdpi/smiley_happy.png", + "java/res/drawable-hdpi/notification_header_warning.png", + "java/res/drawable-hdpi/search_engine_bing.png", + "java/res/drawable-hdpi/coins.png", + "java/res/drawable-hdpi/btn_right.png", + "java/res/drawable-hdpi/bat_icon.png", + "java/res/drawable-hdpi/search_engine_duckduckgo.png", + "java/res/drawable-hdpi/bat_unverified.png", + "java/res/drawable-hdpi/share_icon.png", + "java/res/drawable-hdpi/omnibox_https_valid.png", + "java/res/drawable-mdpi/check.png", + "java/res/drawable-mdpi/btn_bookmark.png", + "java/res/drawable-mdpi/arrow_forward.png", + "java/res/drawable-mdpi/camera.png", + "java/res/drawable-mdpi/slide_up.png", + "java/res/drawable-mdpi/brave_ads_launch_graphic.png", + "java/res/drawable-mdpi/shortcut_incognito.png", + "java/res/drawable-mdpi/smiley_sad.png", + "java/res/drawable-mdpi/header.png", + "java/res/drawable-mdpi/changetip_icon.png", + "java/res/drawable-mdpi/uphold_white.png", + "java/res/drawable-mdpi/down_icon.png", + "java/res/drawable-mdpi/btn_toolbar_reload.png", + "java/res/drawable-mdpi/plus.png", + "java/res/drawable-mdpi/cover_photo.png", + "java/res/drawable-mdpi/icn_unverified_alert.png", + "java/res/drawable-mdpi/slide_down.png", + "java/res/drawable-mdpi/ic_expand_less_black_24dp.png", + "java/res/drawable-mdpi/chromelogo16.png", + "java/res/drawable-mdpi/settings_play_yt_video_in_browser.png", + "java/res/drawable-mdpi/disclosure.png", + "java/res/drawable-mdpi/plane_small.png", + "java/res/drawable-mdpi/location_bar_incognito_badge.png", + "java/res/drawable-mdpi/up_icon.png", + "java/res/drawable-mdpi/checkbox.png", + "java/res/drawable-mdpi/android_onboarding_4.png", + "java/res/drawable-mdpi/icon_error_notification.png", + "java/res/drawable-mdpi/ic_delete_white_24dp.png", + "java/res/drawable-mdpi/checkbox_checked.png", + "java/res/drawable-mdpi/btn_info.png", + "java/res/drawable-mdpi/bat_logo.png", + "java/res/drawable-mdpi/chevron_right.png", + "java/res/drawable-mdpi/search_engine_duckduckgo_lite.png", + "java/res/drawable-mdpi/brave_sync.png", + "java/res/drawable-mdpi/wallet_add.png", + "java/res/drawable-mdpi/btn_suggestion_refine.png", + "java/res/drawable-mdpi/notification_icon.png", + "java/res/drawable-mdpi/icon_warning_notification.png", + "java/res/drawable-mdpi/verified_disclosure.png", + "java/res/drawable-mdpi/search_engine_qwant.png", + "java/res/drawable-mdpi/notification_header_error.png", + "java/res/drawable-mdpi/notification_header.png", + "java/res/drawable-mdpi/grant_icon.png", + "java/res/drawable-mdpi/settings_desktop_mode.png", + "java/res/drawable-mdpi/verified_creator_large.png", + "java/res/drawable-mdpi/btn_star.png", + "java/res/drawable-mdpi/copy_paste.png", + "java/res/drawable-mdpi/omnibox_https_invalid_red.png", + "java/res/drawable-mdpi/group.png", + "java/res/drawable-mdpi/icn_twitter.png", + "java/res/drawable-mdpi/brave_sync_btn_laptop.png", + "java/res/drawable-mdpi/icon_validated_notification.png", + "java/res/drawable-mdpi/ic_file_download_white_24dp.png", + "java/res/drawable-mdpi/icon_close_notification.png", + "java/res/drawable-mdpi/icn_frowning_face.png", + "java/res/drawable-mdpi/contribute_icon.png", + "java/res/drawable-mdpi/bat_outline.png", + "java/res/drawable-mdpi/btn_bookmark_fill.png", + "java/res/drawable-mdpi/btn_delete_24dp.png", + "java/res/drawable-mdpi/incognito_splash.png", + "java/res/drawable-mdpi/btn_left.png", + "java/res/drawable-mdpi/brave_sync_btn_mobile.png", + "java/res/drawable-mdpi/android_onboarding_2.png", + "java/res/drawable-mdpi/wallet_withdraw.png", + "java/res/drawable-mdpi/btn_bat.png", + "java/res/drawable-mdpi/duckduckgo.png", + "java/res/drawable-mdpi/btn_toolbar_home.png", + "java/res/drawable-mdpi/notification_header_normal.png", + "java/res/drawable-mdpi/btn_tabstrip_switch_normal.png", + "java/res/drawable-mdpi/rewards_settings.png", + "java/res/drawable-mdpi/add_funds.png", + "java/res/drawable-mdpi/incognito_simple.png", + "java/res/drawable-mdpi/search_engine_google.png", + "java/res/drawable-mdpi/uphold_green.png", + "java/res/drawable-mdpi/btn_mic.png", + "java/res/drawable-mdpi/btn_star_filled.png", + "java/res/drawable-mdpi/ic_chrome.png", + "java/res/drawable-mdpi/smiley_neutral.png", + "java/res/drawable-mdpi/modern_location_bar.9.png", + "java/res/drawable-mdpi/btn_brave.png", + "java/res/drawable-mdpi/search_engine_startpage.png", + "java/res/drawable-mdpi/btn_brave_off.png", + "java/res/drawable-mdpi/android_br_on.png", + "java/res/drawable-mdpi/coin_stack.png", + "java/res/drawable-mdpi/android_onboarding_3.png", + "java/res/drawable-mdpi/btn_tabswitcher_modern.png", + "java/res/drawable-mdpi/down_arrow.png", + "java/res/drawable-mdpi/icn_youtube.png", + "java/res/drawable-mdpi/android_onboarding_1.png", + "java/res/drawable-mdpi/bat_verified.png", + "java/res/drawable-mdpi/ic_expand_more_black_24dp.png", + "java/res/drawable-mdpi/omnibox_info_red.png", + "java/res/drawable-mdpi/icn_twitch.png", + "java/res/drawable-mdpi/btn_right_tablet.png", + "java/res/drawable-mdpi/brave_onboarding.png", + "java/res/drawable-mdpi/smiley_happy.png", + "java/res/drawable-mdpi/notification_header_warning.png", + "java/res/drawable-mdpi/search_engine_bing.png", + "java/res/drawable-mdpi/coins.png", + "java/res/drawable-mdpi/btn_right.png", + "java/res/drawable-mdpi/bat_icon.png", + "java/res/drawable-mdpi/search_engine_duckduckgo.png", + "java/res/drawable-mdpi/bat_unverified.png", + "java/res/drawable-mdpi/share_icon.png", + "java/res/drawable-mdpi/omnibox_https_valid.png", + "java/res/drawable-nodpi/will_christiansen_glacier_peak.jpg", + "java/res/drawable-nodpi/loader16.png", + "java/res/drawable-nodpi/loader11.png", + "java/res/drawable-nodpi/annie_spratt.jpg", + "java/res/drawable-nodpi/loader28.png", + "java/res/drawable-nodpi/oliwier_gesla.jpg", + "java/res/drawable-nodpi/xavier_balderas_cejudo.jpg", + "java/res/drawable-nodpi/joe_gardner.jpg", + "java/res/drawable-nodpi/dc_cavalleri.jpg", + "java/res/drawable-nodpi/loader10.png", + "java/res/drawable-nodpi/anton_repponen.jpg", + "java/res/drawable-nodpi/loader27.png", + "java/res/drawable-nodpi/loader15.png", + "java/res/drawable-nodpi/loader26.png", + "java/res/drawable-nodpi/loader9.png", + "java/res/drawable-nodpi/andreas_gucklhorn.jpg", + "java/res/drawable-nodpi/loader19.png", + "java/res/drawable-nodpi/ben_karpinski.jpg", + "java/res/drawable-nodpi/loader24.png", + "java/res/drawable-nodpi/loader25.png", + "java/res/drawable-nodpi/loader13.png", + "java/res/drawable-nodpi/loader8.png", + "java/res/drawable-nodpi/loader12.png", + "java/res/drawable-nodpi/loader5.png", + "java/res/drawable-nodpi/loader22.png", + "java/res/drawable-nodpi/loader14.png", + "java/res/drawable-nodpi/matt_palmer.jpg", + "java/res/drawable-nodpi/andy_mai.jpg", + "java/res/drawable-nodpi/loader4.png", + "java/res/drawable-nodpi/loader0_orange.png", + "java/res/drawable-nodpi/loader7.png", + "java/res/drawable-nodpi/loader1.png", + "java/res/drawable-nodpi/loader20.png", + "java/res/drawable-nodpi/loader23.png", + "java/res/drawable-nodpi/anders_jilden.jpg", + "java/res/drawable-nodpi/loader0.png", + "java/res/drawable-nodpi/loader18.png", + "java/res/drawable-nodpi/loader2.png", + "java/res/drawable-nodpi/will_christiansen_ice.jpg", + "java/res/drawable-nodpi/loader21.png", + "java/res/drawable-nodpi/svalbard_jerol_soibam.jpeg", + "java/res/drawable-nodpi/louis_kim.jpg", + "java/res/drawable-nodpi/loader3.png", + "java/res/drawable-nodpi/loader17.png", + "java/res/drawable-nodpi/loader6.png", + "java/res/drawable-xhdpi/check.png", + "java/res/drawable-xhdpi/btn_bookmark.png", + "java/res/drawable-xhdpi/arrow_forward.png", + "java/res/drawable-xhdpi/camera.png", + "java/res/drawable-xhdpi/slide_up.png", + "java/res/drawable-xhdpi/brave_ads_launch_graphic.png", + "java/res/drawable-xhdpi/shortcut_incognito.png", + "java/res/drawable-xhdpi/smiley_sad.png", + "java/res/drawable-xhdpi/header.png", + "java/res/drawable-xhdpi/changetip_icon.png", + "java/res/drawable-xhdpi/uphold_white.png", + "java/res/drawable-xhdpi/down_icon.png", + "java/res/drawable-xhdpi/btn_toolbar_reload.png", + "java/res/drawable-xhdpi/plus.png", + "java/res/drawable-xhdpi/cover_photo.png", + "java/res/drawable-xhdpi/icn_unverified_alert.png", + "java/res/drawable-xhdpi/slide_down.png", + "java/res/drawable-xhdpi/ic_expand_less_black_24dp.png", + "java/res/drawable-xhdpi/chromelogo16.png", + "java/res/drawable-xhdpi/settings_play_yt_video_in_browser.png", + "java/res/drawable-xhdpi/disclosure.png", + "java/res/drawable-xhdpi/plane_small.png", + "java/res/drawable-xhdpi/location_bar_incognito_badge.png", + "java/res/drawable-xhdpi/up_icon.png", + "java/res/drawable-xhdpi/checkbox.png", + "java/res/drawable-xhdpi/android_onboarding_4.png", + "java/res/drawable-xhdpi/icon_error_notification.png", + "java/res/drawable-xhdpi/ic_delete_white_24dp.png", + "java/res/drawable-xhdpi/checkbox_checked.png", + "java/res/drawable-xhdpi/btn_info.png", + "java/res/drawable-xhdpi/bat_logo.png", + "java/res/drawable-xhdpi/chevron_right.png", + "java/res/drawable-xhdpi/search_engine_duckduckgo_lite.png", + "java/res/drawable-xhdpi/brave_sync.png", + "java/res/drawable-xhdpi/wallet_add.png", + "java/res/drawable-xhdpi/btn_suggestion_refine.png", + "java/res/drawable-xhdpi/notification_icon.png", + "java/res/drawable-xhdpi/icon_warning_notification.png", + "java/res/drawable-xhdpi/verified_disclosure.png", + "java/res/drawable-xhdpi/search_engine_qwant.png", + "java/res/drawable-xhdpi/notification_header_error.png", + "java/res/drawable-xhdpi/notification_header.png", + "java/res/drawable-xhdpi/grant_icon.png", + "java/res/drawable-xhdpi/settings_desktop_mode.png", + "java/res/drawable-xhdpi/verified_creator_large.png", + "java/res/drawable-xhdpi/btn_star.png", + "java/res/drawable-xhdpi/copy_paste.png", + "java/res/drawable-xhdpi/omnibox_https_invalid_red.png", + "java/res/drawable-xhdpi/group.png", + "java/res/drawable-xhdpi/icn_twitter.png", + "java/res/drawable-xhdpi/brave_sync_btn_laptop.png", + "java/res/drawable-xhdpi/icon_validated_notification.png", + "java/res/drawable-xhdpi/ic_file_download_white_24dp.png", + "java/res/drawable-xhdpi/icon_close_notification.png", + "java/res/drawable-xhdpi/icn_frowning_face.png", + "java/res/drawable-xhdpi/contribute_icon.png", + "java/res/drawable-xhdpi/bat_outline.png", + "java/res/drawable-xhdpi/btn_bookmark_fill.png", + "java/res/drawable-xhdpi/btn_delete_24dp.png", + "java/res/drawable-xhdpi/incognito_splash.png", + "java/res/drawable-xhdpi/btn_left.png", + "java/res/drawable-xhdpi/brave_sync_btn_mobile.png", + "java/res/drawable-xhdpi/android_onboarding_2.png", + "java/res/drawable-xhdpi/wallet_withdraw.png", + "java/res/drawable-xhdpi/btn_bat.png", + "java/res/drawable-xhdpi/duckduckgo.png", + "java/res/drawable-xhdpi/btn_toolbar_home.png", + "java/res/drawable-xhdpi/notification_header_normal.png", + "java/res/drawable-xhdpi/btn_tabstrip_switch_normal.png", + "java/res/drawable-xhdpi/rewards_settings.png", + "java/res/drawable-xhdpi/add_funds.png", + "java/res/drawable-xhdpi/incognito_simple.png", + "java/res/drawable-xhdpi/search_engine_google.png", + "java/res/drawable-xhdpi/uphold_green.png", + "java/res/drawable-xhdpi/btn_mic.png", + "java/res/drawable-xhdpi/btn_star_filled.png", + "java/res/drawable-xhdpi/ic_chrome.png", + "java/res/drawable-xhdpi/smiley_neutral.png", + "java/res/drawable-xhdpi/modern_location_bar.9.png", + "java/res/drawable-xhdpi/btn_brave.png", + "java/res/drawable-xhdpi/search_engine_startpage.png", + "java/res/drawable-xhdpi/btn_brave_off.png", + "java/res/drawable-xhdpi/android_br_on.png", + "java/res/drawable-xhdpi/coin_stack.png", + "java/res/drawable-xhdpi/android_onboarding_3.png", + "java/res/drawable-xhdpi/btn_tabswitcher_modern.png", + "java/res/drawable-xhdpi/down_arrow.png", + "java/res/drawable-xhdpi/icn_youtube.png", + "java/res/drawable-xhdpi/android_onboarding_1.png", + "java/res/drawable-xhdpi/bat_verified.png", + "java/res/drawable-xhdpi/ic_expand_more_black_24dp.png", + "java/res/drawable-xhdpi/omnibox_info_red.png", + "java/res/drawable-xhdpi/icn_twitch.png", + "java/res/drawable-xhdpi/btn_right_tablet.png", + "java/res/drawable-xhdpi/brave_onboarding.png", + "java/res/drawable-xhdpi/smiley_happy.png", + "java/res/drawable-xhdpi/notification_header_warning.png", + "java/res/drawable-xhdpi/search_engine_bing.png", + "java/res/drawable-xhdpi/coins.png", + "java/res/drawable-xhdpi/btn_right.png", + "java/res/drawable-xhdpi/bat_icon.png", + "java/res/drawable-xhdpi/search_engine_duckduckgo.png", + "java/res/drawable-xhdpi/bat_unverified.png", + "java/res/drawable-xhdpi/share_icon.png", + "java/res/drawable-xhdpi/omnibox_https_valid.png", + "java/res/drawable-xxhdpi/check.png", + "java/res/drawable-xxhdpi/btn_bookmark.png", + "java/res/drawable-xxhdpi/arrow_forward.png", + "java/res/drawable-xxhdpi/camera.png", + "java/res/drawable-xxhdpi/slide_up.png", + "java/res/drawable-xxhdpi/brave_ads_launch_graphic.png", + "java/res/drawable-xxhdpi/shortcut_incognito.png", + "java/res/drawable-xxhdpi/smiley_sad.png", + "java/res/drawable-xxhdpi/header.png", + "java/res/drawable-xxhdpi/changetip_icon.png", + "java/res/drawable-xxhdpi/uphold_white.png", + "java/res/drawable-xxhdpi/down_icon.png", + "java/res/drawable-xxhdpi/btn_toolbar_reload.png", + "java/res/drawable-xxhdpi/plus.png", + "java/res/drawable-xxhdpi/cover_photo.png", + "java/res/drawable-xxhdpi/icn_unverified_alert.png", + "java/res/drawable-xxhdpi/slide_down.png", + "java/res/drawable-xxhdpi/ic_expand_less_black_24dp.png", + "java/res/drawable-xxhdpi/chromelogo16.png", + "java/res/drawable-xxhdpi/settings_play_yt_video_in_browser.png", + "java/res/drawable-xxhdpi/disclosure.png", + "java/res/drawable-xxhdpi/plane_small.png", + "java/res/drawable-xxhdpi/location_bar_incognito_badge.png", + "java/res/drawable-xxhdpi/up_icon.png", + "java/res/drawable-xxhdpi/checkbox.png", + "java/res/drawable-xxhdpi/android_onboarding_4.png", + "java/res/drawable-xxhdpi/icon_error_notification.png", + "java/res/drawable-xxhdpi/ic_delete_white_24dp.png", + "java/res/drawable-xxhdpi/checkbox_checked.png", + "java/res/drawable-xxhdpi/btn_info.png", + "java/res/drawable-xxhdpi/bat_logo.png", + "java/res/drawable-xxhdpi/chevron_right.png", + "java/res/drawable-xxhdpi/search_engine_duckduckgo_lite.png", + "java/res/drawable-xxhdpi/brave_sync.png", + "java/res/drawable-xxhdpi/wallet_add.png", + "java/res/drawable-xxhdpi/btn_suggestion_refine.png", + "java/res/drawable-xxhdpi/notification_icon.png", + "java/res/drawable-xxhdpi/icon_warning_notification.png", + "java/res/drawable-xxhdpi/verified_disclosure.png", + "java/res/drawable-xxhdpi/search_engine_qwant.png", + "java/res/drawable-xxhdpi/notification_header_error.png", + "java/res/drawable-xxhdpi/notification_header.png", + "java/res/drawable-xxhdpi/grant_icon.png", + "java/res/drawable-xxhdpi/settings_desktop_mode.png", + "java/res/drawable-xxhdpi/verified_creator_large.png", + "java/res/drawable-xxhdpi/btn_star.png", + "java/res/drawable-xxhdpi/copy_paste.png", + "java/res/drawable-xxhdpi/omnibox_https_invalid_red.png", + "java/res/drawable-xxhdpi/group.png", + "java/res/drawable-xxhdpi/icn_twitter.png", + "java/res/drawable-xxhdpi/brave_sync_btn_laptop.png", + "java/res/drawable-xxhdpi/icon_validated_notification.png", + "java/res/drawable-xxhdpi/ic_file_download_white_24dp.png", + "java/res/drawable-xxhdpi/icon_close_notification.png", + "java/res/drawable-xxhdpi/icn_frowning_face.png", + "java/res/drawable-xxhdpi/contribute_icon.png", + "java/res/drawable-xxhdpi/bat_outline.png", + "java/res/drawable-xxhdpi/btn_bookmark_fill.png", + "java/res/drawable-xxhdpi/btn_delete_24dp.png", + "java/res/drawable-xxhdpi/incognito_splash.png", + "java/res/drawable-xxhdpi/btn_left.png", + "java/res/drawable-xxhdpi/brave_sync_btn_mobile.png", + "java/res/drawable-xxhdpi/android_onboarding_2.png", + "java/res/drawable-xxhdpi/wallet_withdraw.png", + "java/res/drawable-xxhdpi/btn_bat.png", + "java/res/drawable-xxhdpi/duckduckgo.png", + "java/res/drawable-xxhdpi/btn_toolbar_home.png", + "java/res/drawable-xxhdpi/notification_header_normal.png", + "java/res/drawable-xxhdpi/btn_tabstrip_switch_normal.png", + "java/res/drawable-xxhdpi/rewards_settings.png", + "java/res/drawable-xxhdpi/add_funds.png", + "java/res/drawable-xxhdpi/incognito_simple.png", + "java/res/drawable-xxhdpi/search_engine_google.png", + "java/res/drawable-xxhdpi/uphold_green.png", + "java/res/drawable-xxhdpi/btn_mic.png", + "java/res/drawable-xxhdpi/btn_star_filled.png", + "java/res/drawable-xxhdpi/ic_chrome.png", + "java/res/drawable-xxhdpi/smiley_neutral.png", + "java/res/drawable-xxhdpi/modern_location_bar.9.png", + "java/res/drawable-xxhdpi/btn_brave.png", + "java/res/drawable-xxhdpi/search_engine_startpage.png", + "java/res/drawable-xxhdpi/btn_brave_off.png", + "java/res/drawable-xxhdpi/qrcode_dark.png", + "java/res/drawable-xxhdpi/android_br_on.png", + "java/res/drawable-xxhdpi/coin_stack.png", + "java/res/drawable-xxhdpi/android_onboarding_3.png", + "java/res/drawable-xxhdpi/btn_tabswitcher_modern.png", + "java/res/drawable-xxhdpi/qrcode_light.png", + "java/res/drawable-xxhdpi/icn_youtube.png", + "java/res/drawable-xxhdpi/android_onboarding_1.png", + "java/res/drawable-xxhdpi/bat_verified.png", + "java/res/drawable-xxhdpi/ic_expand_more_black_24dp.png", + "java/res/drawable-xxhdpi/omnibox_info_red.png", + "java/res/drawable-xxhdpi/icn_twitch.png", + "java/res/drawable-xxhdpi/btn_right_tablet.png", + "java/res/drawable-xxhdpi/brave_onboarding.png", + "java/res/drawable-xxhdpi/smiley_happy.png", + "java/res/drawable-xxhdpi/notification_header_warning.png", + "java/res/drawable-xxhdpi/search_engine_bing.png", + "java/res/drawable-xxhdpi/coins.png", + "java/res/drawable-xxhdpi/btn_right.png", + "java/res/drawable-xxhdpi/bat_icon.png", + "java/res/drawable-xxhdpi/search_engine_duckduckgo.png", + "java/res/drawable-xxhdpi/bat_unverified.png", + "java/res/drawable-xxhdpi/share_icon.png", + "java/res/drawable-xxhdpi/omnibox_https_valid.png", + "java/res/drawable-xxxhdpi/check.png", + "java/res/drawable-xxxhdpi/btn_bookmark.png", + "java/res/drawable-xxxhdpi/arrow_forward.png", + "java/res/drawable-xxxhdpi/camera.png", + "java/res/drawable-xxxhdpi/slide_up.png", + "java/res/drawable-xxxhdpi/brave_ads_launch_graphic.png", + "java/res/drawable-xxxhdpi/shortcut_incognito.png", + "java/res/drawable-xxxhdpi/smiley_sad.png", + "java/res/drawable-xxxhdpi/header.png", + "java/res/drawable-xxxhdpi/changetip_icon.png", + "java/res/drawable-xxxhdpi/uphold_white.png", + "java/res/drawable-xxxhdpi/down_icon.png", + "java/res/drawable-xxxhdpi/btn_toolbar_reload.png", + "java/res/drawable-xxxhdpi/plus.png", + "java/res/drawable-xxxhdpi/cover_photo.png", + "java/res/drawable-xxxhdpi/icn_unverified_alert.png", + "java/res/drawable-xxxhdpi/slide_down.png", + "java/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png", + "java/res/drawable-xxxhdpi/chromelogo16.png", + "java/res/drawable-xxxhdpi/settings_play_yt_video_in_browser.png", + "java/res/drawable-xxxhdpi/disclosure.png", + "java/res/drawable-xxxhdpi/plane_small.png", + "java/res/drawable-xxxhdpi/location_bar_incognito_badge.png", + "java/res/drawable-xxxhdpi/up_icon.png", + "java/res/drawable-xxxhdpi/checkbox.png", + "java/res/drawable-xxxhdpi/icon_error_notification.png", + "java/res/drawable-xxxhdpi/ic_delete_white_24dp.png", + "java/res/drawable-xxxhdpi/checkbox_checked.png", + "java/res/drawable-xxxhdpi/btn_info.png", + "java/res/drawable-xxxhdpi/bat_logo.png", + "java/res/drawable-xxxhdpi/brave_sync.png", + "java/res/drawable-xxxhdpi/wallet_add.png", + "java/res/drawable-xxxhdpi/btn_suggestion_refine.png", + "java/res/drawable-xxxhdpi/notification_icon.png", + "java/res/drawable-xxxhdpi/icon_warning_notification.png", + "java/res/drawable-xxxhdpi/verified_disclosure.png", + "java/res/drawable-xxxhdpi/notification_header_error.png", + "java/res/drawable-xxxhdpi/notification_header.png", + "java/res/drawable-xxxhdpi/grant_icon.png", + "java/res/drawable-xxxhdpi/settings_desktop_mode.png", + "java/res/drawable-xxxhdpi/verified_creator_large.png", + "java/res/drawable-xxxhdpi/btn_star.png", + "java/res/drawable-xxxhdpi/copy_paste.png", + "java/res/drawable-xxxhdpi/omnibox_https_invalid_red.png", + "java/res/drawable-xxxhdpi/group.png", + "java/res/drawable-xxxhdpi/icn_twitter.png", + "java/res/drawable-xxxhdpi/brave_sync_btn_laptop.png", + "java/res/drawable-xxxhdpi/icon_validated_notification.png", + "java/res/drawable-xxxhdpi/ic_file_download_white_24dp.png", + "java/res/drawable-xxxhdpi/icon_close_notification.png", + "java/res/drawable-xxxhdpi/icn_frowning_face.png", + "java/res/drawable-xxxhdpi/contribute_icon.png", + "java/res/drawable-xxxhdpi/bat_outline.png", + "java/res/drawable-xxxhdpi/btn_bookmark_fill.png", + "java/res/drawable-xxxhdpi/btn_delete_24dp.png", + "java/res/drawable-xxxhdpi/incognito_splash.png", + "java/res/drawable-xxxhdpi/btn_left.png", + "java/res/drawable-xxxhdpi/brave_sync_btn_mobile.png", + "java/res/drawable-xxxhdpi/wallet_withdraw.png", + "java/res/drawable-xxxhdpi/btn_bat.png", + "java/res/drawable-xxxhdpi/duckduckgo.png", + "java/res/drawable-xxxhdpi/btn_toolbar_home.png", + "java/res/drawable-xxxhdpi/notification_header_normal.png", + "java/res/drawable-xxxhdpi/btn_tabstrip_switch_normal.png", + "java/res/drawable-xxxhdpi/rewards_settings.png", + "java/res/drawable-xxxhdpi/add_funds.png", + "java/res/drawable-xxxhdpi/incognito_simple.png", + "java/res/drawable-xxxhdpi/uphold_green.png", + "java/res/drawable-xxxhdpi/btn_mic.png", + "java/res/drawable-xxxhdpi/btn_star_filled.png", + "java/res/drawable-xxxhdpi/ic_chrome.png", + "java/res/drawable-xxxhdpi/smiley_neutral.png", + "java/res/drawable-xxxhdpi/btn_brave.png", + "java/res/drawable-xxxhdpi/btn_brave_off.png", + "java/res/drawable-xxxhdpi/qrcode_dark.png", + "java/res/drawable-xxxhdpi/coin_stack.png", + "java/res/drawable-xxxhdpi/btn_tabswitcher_modern.png", + "java/res/drawable-xxxhdpi/qrcode_light.png", + "java/res/drawable-xxxhdpi/icn_youtube.png", + "java/res/drawable-xxxhdpi/bat_verified.png", + "java/res/drawable-xxxhdpi/ic_expand_more_black_24dp.png", + "java/res/drawable-xxxhdpi/omnibox_info_red.png", + "java/res/drawable-xxxhdpi/icn_twitch.png", + "java/res/drawable-xxxhdpi/btn_right_tablet.png", + "java/res/drawable-xxxhdpi/smiley_happy.png", + "java/res/drawable-xxxhdpi/notification_header_warning.png", + "java/res/drawable-xxxhdpi/coins.png", + "java/res/drawable-xxxhdpi/btn_right.png", + "java/res/drawable-xxxhdpi/bat_icon.png", + "java/res/drawable-xxxhdpi/bat_unverified.png", + "java/res/drawable-xxxhdpi/share_icon.png", + "java/res/drawable-xxxhdpi/omnibox_https_valid.png", + "java/res/layout/brave_shields_ads_tracking_switcher.xml", + "java/res/layout/web_notification_icon_frame_brave.xml", + "java/res/layout/brave_sync_layout.xml", + "java/res/layout/location_status_incognito_badge.xml", + "java/res/layout/fragment_troubleshooting_onboarding.xml", + "java/res/layout/user_wallet_activity.xml", + "java/res/layout/brave_shields_option_layout.xml", + "java/res/layout/brave_shields_thank_you_layout.xml", + "java/res/layout/new_tab_page_incognito.xml", + "java/res/layout/fragment_super_referral_share.xml", + "java/res/layout/activity_onboarding.xml", + "java/res/layout/brave_stats_layout.xml", + "java/res/layout/brave_shields_secondary_layout.xml", + "java/res/layout/report_broken_site_layout.xml", + "java/res/layout/brave_shields_3rd_party_cookies_blocked_switcher.xml", + "java/res/layout/brave_set_default_browser_dialog.xml", + "java/res/layout/brave_rewards_spinnner_item.xml", + "java/res/layout/fragment_brave_shields_onboarding.xml", + "java/res/layout/brave_ads_existing_user_dialog_layout.xml", + "java/res/layout/brave_rewards_panel.xml", + "java/res/layout/brave_rewards_site_banner.xml", + "java/res/layout/brave_shields_switcher.xml", + "java/res/layout/verify_wallet_activity.xml", + "java/res/layout/brave_shields_menu_item.xml", + "java/res/layout/brave_shields_fingerprints_blocked_switcher.xml", + "java/res/layout/fragment_search_engine_onboarding.xml", + "java/res/layout/brave_rewards_spinnner_item_dropdown.xml", + "java/res/layout/brave_rewards_grants_list_item.xml", + "java/res/layout/add_sync_device_name_dialog.xml", + "java/res/layout/brave_rewards_donation_sent.xml", + "java/res/layout/ntp_bottom_sheet.xml", + "java/res/layout/brave_shields_scripts_blocked_switcher.xml", + "java/res/layout/brave_sync_device.xml", + "java/res/layout/brave_ddg_offer_link.xml", + "java/res/layout/ntp_non_distruptive_banner.xml", + "java/res/layout/brave_shields_https_upgrade_switcher.xml", + "java/res/layout/brave_toolbar.xml", + "java/res/layout/web_notification_big_brave_ads.xml", + "java/res/layout/brave_sync_done.xml", + "java/res/layout/brave_shields_main_layout.xml", + "java/res/layout/fragment_brave_rewards_onboarding.xml", + "java/res/layout/brave_shields_toggle_layout.xml", + "java/res/layout/new_tab_page_layout.xml", + "java/res/layout/fragment_rate_dialog.xml", + "java/res/layout/brave_ads_new_user_dialog_layout.xml", + "java/res/layout/brave_shields_text_item.xml", + "java/res/layout/new_tab_page_view.xml", + "java/res/layout/fragment_brave_ads_onboarding.xml", + "java/res/layout/brave_rewards_reset_tab_content.xml", + "java/res/layout/brave_bookmark_toolbar.xml", + "java/res/layout/qa_code_check.xml", + "java/res/layout/web_notification_brave_ads.xml", + "java/res/layout/brave_custom_tabs_toolbar.xml", + "java/res/layout/brave_sync_add_mobile.xml", + "java/res/layout/brave_rewards_panel_header.xml", + "java/res/layout/brave_rewards_auto_contrib.xml", + "java/res/layout/brave_bottom_new_tab_button.xml", + "java/res/layout/ddg_offer_layout.xml", + "java/res/layout/menu_separator.xml", + "java/res/layout/brave_rewards_panel_grant.xml", + "java/res/layout/brave_sync_add_laptop.xml", + "java/res/layout-land/brave_rewards_site_banner.xml", + "java/res/layout-land/verify_wallet_activity.xml", + "java/res/menu/new_tab_menu.xml", + "java/res/menu/exit_settings_menu.xml", + "java/res/values/brave_ids.xml", + "java/res/values/brave_styles.xml", + "java/res/values/brave_colors.xml", + "java/res/values/brave_dimens.xml", + "java/res/values-h380dp/dimens.xml", + "java/res/values-h500dp/dimens.xml", + "java/res/values-h568dp/dimens.xml", + "java/res/values-h730dp/dimens.xml", + "java/res/values-h748dp/dimens.xml", + "java/res/values-h765dp/dimens.xml", + "java/res/values-h820dp/dimens.xml", + "java/res/values-night/brave_colors.xml", + "java/res/values-v21/brave_styles.xml", + "java/res/xml/brave_main_preferences.xml", + "java/res/xml/background_video_playback_preference.xml", + "java/res/xml/brave_rewards_debug_preferences.xml", + "java/res/xml/background_images_preferences.xml", + "java/res/xml/developer_preferences.xml", + "java/res/xml/use_custom_tabs_brave_preference.xml", + "java/res/xml/play_yt_video_in_browser_preferences.xml", + "java/res/xml/brave_theme_preferences.xml", + "java/res/xml/brave_license_preferences.xml", + "java/res/xml/desktop_mode_preferences.xml", + "java/res/xml/legal_information_preferences.xml", + "java/res/xml/qa_preferences.xml", + "java/res/xml/brave_rewards_preferences.xml", + "java/res/xml/closing_all_tabs_closes_brave_preference.xml", + "java/res/xml/clear_browsing_data_preferences_tab.xml", + "java/res/xml/brave_site_settings_preferences.xml", + "java/res/xml/brave_privacy_preferences.xml", + "java/res/xml/appearance_preferences.xml", +] diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index 80779fe42f30..64b073d05b9e 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -35,8 +35,11 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/bookmarks/BraveBookmarkWorker.java", "../../brave/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java", "../../brave/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java", - "../../brave/android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java", "../../brave/android/java/org/chromium/chrome/browser/help/BraveHelpAndFeedback.java", + "../../brave/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java", + "../../brave/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java", + "../../brave/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java", + "../../brave/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java", "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationManagerProxyImpl.java", "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationPlatformBridge.java", "../../brave/android/java/org/chromium/chrome/browser/notifications/BraveNotificationSettingsBridge.java", @@ -80,6 +83,7 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/preferences/BraveSyncScreensObserver.java", "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java", "../../brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettingsObserver.java", + "../../brave/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java", "../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java", "../../brave/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java", "../../brave/android/java/org/chromium/chrome/browser/qrreader/CameraSource.java", @@ -103,21 +107,17 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java", "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java", "../../brave/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java", "../../brave/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java", "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java", - "../../brave/android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java", "../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java", + "../../brave/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java", + "../../brave/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java", + "../../brave/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java", "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncService.java", "../../brave/android/java/org/chromium/chrome/browser/sync/BraveSyncServiceObserver.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BookmarksButton.java", + "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java", "../../brave/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java", diff --git a/android/java/apk_for_test.flags b/android/java/apk_for_test.flags index 117da464fb16..07e284cc5016 100644 --- a/android/java/apk_for_test.flags +++ b/android/java/apk_for_test.flags @@ -23,10 +23,14 @@ *** createBookmarkItem(...); } --keep class org.chromium.chrome.browser.externalnav.ExternalNavigationHandler { +-keep class org.chromium.components.external_intents.ExternalNavigationHandler { *** clobberCurrentTabWithFallbackUrl(...); } -keep class org.chromium.chrome.browser.LaunchIntentDispatcher { *** isCustomTabIntent(...); } + +-keep class org.chromium.chrome.browser.homepage.HomepageManager { + *** shouldCloseAppWithZeroTabs(...); +} diff --git a/android/java/org/chromium/chrome/browser/BraveActivity.java b/android/java/org/chromium/chrome/browser/BraveActivity.java index b0d394e9bb3d..880d48ff8821 100644 --- a/android/java/org/chromium/chrome/browser/BraveActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveActivity.java @@ -34,6 +34,8 @@ import org.chromium.chrome.browser.BraveSyncWorker; import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.bookmarks.BookmarkModel; +import org.chromium.chrome.browser.dependency_injection.ChromeActivityComponent; +import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService; import org.chromium.chrome.browser.onboarding.OnboardingActivity; import org.chromium.chrome.browser.onboarding.OnboardingPrefManager; @@ -51,7 +53,7 @@ import org.chromium.chrome.browser.toolbar.top.BraveToolbarLayout; import org.chromium.chrome.browser.util.BraveDbUtil; import org.chromium.chrome.browser.util.BraveReferrer; -import org.chromium.chrome.browser.util.UrlConstants; +import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.chrome.browser.preferences.BravePreferenceKeys; import org.chromium.components.bookmarks.BookmarkId; import org.chromium.components.bookmarks.BookmarkType; @@ -64,7 +66,7 @@ * Brave's extension for ChromeActivity */ @JNINamespace("chrome::android") -public abstract class BraveActivity extends ChromeActivity { +public abstract class BraveActivity extends ChromeActivity { public static final int SITE_BANNER_REQUEST_CODE = 33; public static final int VERIFY_WALLET_ACTIVITY_REQUEST_CODE = 34; public static final int USER_WALLET_ACTIVITY_REQUEST_CODE = 35; diff --git a/android/java/org/chromium/chrome/browser/BraveHelper.java b/android/java/org/chromium/chrome/browser/BraveHelper.java index bcaf0d77f2f6..75cbabc41b66 100644 --- a/android/java/org/chromium/chrome/browser/BraveHelper.java +++ b/android/java/org/chromium/chrome/browser/BraveHelper.java @@ -7,7 +7,7 @@ import org.chromium.base.CommandLine; import org.chromium.base.ContextUtils; -import org.chromium.chrome.browser.ChromeSwitches; +import org.chromium.chrome.browser.flags.ChromeSwitches; import org.chromium.chrome.browser.firstrun.FirstRunStatus; public class BraveHelper { diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java index 1972d772591e..e08e9d4554f2 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsDonationSentActivity.java @@ -18,7 +18,7 @@ import android.widget.ImageView; import android.widget.TextView; -import org.chromium.chrome.browser.util.IntentUtils; +import org.chromium.base.IntentUtils; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.BraveRewardsNativeWorker; @@ -51,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) { String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_); Tab currentActiveTab = BraveRewardsHelper.currentActiveTab(); - String url = currentActiveTab.getUrl(); + String url = currentActiveTab.getUrlString(); String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL; mIconFetcher = new org.chromium.chrome.browser.BraveRewardsHelper(); mIconFetcher.retrieveLargeIcon(favicon_url, this); diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java index 3745ec241179..2296ec3f96d4 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsHelper.java @@ -25,12 +25,14 @@ import org.chromium.base.annotations.CalledByNative; import org.chromium.chrome.browser.BraveActivity; import org.chromium.chrome.browser.ChromeTabbedActivity; -import org.chromium.chrome.browser.favicon.IconType; -import org.chromium.chrome.browser.favicon.LargeIconBridge; +import org.chromium.chrome.browser.profiles.Profile; +import org.chromium.chrome.browser.ui.favicon.IconType; +import org.chromium.chrome.browser.ui.favicon.LargeIconBridge; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabImpl; -import org.chromium.chrome.browser.favicon.RoundedIconGenerator; +import org.chromium.chrome.browser.ui.favicon.RoundedIconGenerator; import org.chromium.chrome.R; +import org.chromium.url.GURL; import java.math.BigDecimal; import java.util.Calendar; @@ -61,7 +63,7 @@ public interface LargeIconReadyCallback { public BraveRewardsHelper () { if (mLargeIconBridge == null) { - mLargeIconBridge = new LargeIconBridge(((TabImpl)currentActiveTab()).getProfile()); + mLargeIconBridge = new LargeIconBridge(Profile.fromWebContents(((TabImpl)currentActiveTab()).getWebContents())); } } @@ -94,7 +96,7 @@ private void retrieveLargeIconInternal() { if (mFaviconUrl == null || mFaviconUrl.isEmpty() || mFaviconUrl.equals("clear")) { Tab tab = currentActiveTab(); if (tab != null) { - mFaviconUrl = tab.getUrl(); + mFaviconUrl = tab.getUrlString(); } mHandler.postDelayed(new Runnable() { @@ -109,7 +111,7 @@ public void run() { //get the icon if (mLargeIconBridge!= null && mCallback != null && !mFaviconUrl.isEmpty()) { - mLargeIconBridge.getLargeIconForUrl(mFaviconUrl,FAVICON_DESIRED_SIZE, this); + mLargeIconBridge.getLargeIconForUrl(new GURL(mFaviconUrl),FAVICON_DESIRED_SIZE, this); } } diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java index f3aceb52244f..d646c0f5dda7 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsNativeWorker.java @@ -16,7 +16,7 @@ import org.chromium.chrome.browser.BraveRewardsObserver; import org.chromium.chrome.browser.BraveRewardsPublisher.PublisherStatus; import org.chromium.chrome.browser.tab.Tab; -import org.chromium.chrome.browser.util.UrlConstants; +import org.chromium.components.embedder_support.util.UrlConstants; import org.json.JSONException; import java.util.ArrayList; @@ -154,7 +154,7 @@ private void TriggerOnNotifyFrontTabUrlChanged() { public void run() { Tab tab = BraveRewardsHelper.currentActiveTab(); if (tab != null && !tab.isIncognito()) { - OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrl()); + OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrlString()); } } }); diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java index 478ff2184da2..871c3be2e921 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsPanelPopup.java @@ -650,7 +650,7 @@ public void ShowWebSiteView(boolean returning_to_rewards) { ShowRewardsSummary(); Tab currentActiveTab = BraveRewardsHelper.currentActiveTab(); if (currentActiveTab != null && !currentActiveTab.isIncognito()) { - String url = currentActiveTab.getUrl(); + String url = currentActiveTab.getUrlString(); if (URLUtil.isValidUrl(url)) { mBraveRewardsNativeWorker.GetPublisherInfo(currentActiveTab.getId(), url); mPublisherFetcher = new Timer(); @@ -1241,7 +1241,7 @@ public void OnPublisherInfo(int tabId) { String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId); Tab currentActiveTab = BraveRewardsHelper.currentActiveTab(); - String url = currentActiveTab.getUrl(); + String url = currentActiveTab.getUrlString(); final String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL; mIconFetcher.retrieveLargeIcon(favicon_url,this); diff --git a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java index f5051021d7cb..6f406681dcdb 100644 --- a/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java +++ b/android/java/org/chromium/chrome/browser/BraveRewardsSiteBannerActivity.java @@ -23,7 +23,7 @@ import android.widget.ToggleButton; import android.text.Spanned; import android.view.MotionEvent; -import org.chromium.chrome.browser.util.IntentUtils; +import org.chromium.base.IntentUtils; import org.chromium.chrome.browser.BraveRewardsBalance; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.BraveRewardsNativeWorker; @@ -129,7 +129,7 @@ public void onClick(View view) { String publisherFavIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(currentTabId_); Tab currentActiveTab = BraveRewardsHelper.currentActiveTab(); - String url = currentActiveTab.getUrl(); + String url = currentActiveTab.getUrlString(); String favicon_url = (publisherFavIconURL.isEmpty()) ? url : publisherFavIconURL; mIconFetcher = new BraveRewardsHelper(); mIconFetcher.retrieveLargeIcon(favicon_url, this); diff --git a/android/java/org/chromium/chrome/browser/BraveSyncWorker.java b/android/java/org/chromium/chrome/browser/BraveSyncWorker.java index 96ce4136710a..baa7a7fb1b42 100755 --- a/android/java/org/chromium/chrome/browser/BraveSyncWorker.java +++ b/android/java/org/chromium/chrome/browser/BraveSyncWorker.java @@ -2567,7 +2567,7 @@ public void run() { mNewBookmarkModel.setBookmarkTitle(bookmarkId, mTitle); } if (!mUrl.isEmpty() && bookmarkItem.isUrlEditable()) { - String fixedUrl = UrlFormatter.fixupUrl(mUrl); + String fixedUrl = UrlFormatter.fixupUrl(mUrl).getSpec(); if (null != fixedUrl && !fixedUrl.equals(bookmarkItem.getTitle())) { mNewBookmarkModel.setBookmarkUrl(bookmarkId, fixedUrl); } diff --git a/android/java/org/chromium/chrome/browser/BraveUphold.java b/android/java/org/chromium/chrome/browser/BraveUphold.java index b70fdd26585e..292e1ad2f115 100644 --- a/android/java/org/chromium/chrome/browser/BraveUphold.java +++ b/android/java/org/chromium/chrome/browser/BraveUphold.java @@ -19,7 +19,7 @@ import org.chromium.chrome.browser.BraveRewardsNativeWorker; import org.chromium.chrome.browser.BraveRewardsObserver; import org.chromium.chrome.browser.externalnav.BraveExternalNavigationHandler; -import org.chromium.chrome.browser.externalnav.ExternalNavigationParams; +import org.chromium.components.external_intents.ExternalNavigationParams; import org.chromium.chrome.R; import org.json.JSONException; import org.json.JSONObject; diff --git a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java index dc439460eabe..26d4ce80caa2 100644 --- a/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java +++ b/android/java/org/chromium/chrome/browser/appmenu/BraveTabbedAppMenuPropertiesDelegate.java @@ -20,12 +20,12 @@ import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.bookmarks.BookmarkBridge; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; -import org.chromium.chrome.browser.flags.FeatureUtilities; import org.chromium.chrome.browser.multiwindow.MultiWindowModeStateDispatcher; import org.chromium.chrome.browser.notifications.BraveSetDefaultBrowserNotificationService; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.tabbed_mode.TabbedAppMenuPropertiesDelegate; import org.chromium.chrome.browser.tabmodel.TabModelSelector; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; import org.chromium.chrome.browser.toolbar.ToolbarManager; import org.chromium.chrome.browser.ui.appmenu.AppMenuDelegate; import org.chromium.chrome.browser.ui.appmenu.AppMenuHandler; @@ -96,7 +96,7 @@ public void onFooterViewInflated(AppMenuHandler appMenuHandler, View view) { // Hide bookmark button if bottom toolbar is enabled ImageButton bookmarkButton = view.findViewById(R.id.bookmark_this_page_id); - if (bookmarkButton != null && FeatureUtilities.isBottomToolbarEnabled()) { + if (bookmarkButton != null && BottomToolbarConfiguration.isBottomToolbarEnabled()) { bookmarkButton.setVisibility(View.GONE); } diff --git a/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java b/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java index 2f519ad0392f..da8467977467 100644 --- a/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java +++ b/android/java/org/chromium/chrome/browser/document/BraveLauncherActivity.java @@ -9,8 +9,8 @@ import android.os.Bundle; import org.chromium.chrome.browser.BraveHelper; -import org.chromium.chrome.browser.flags.FeatureUtilities; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; /** * Base class for ChromeLauncherActivity @@ -22,7 +22,7 @@ public void onCreate(Bundle savedInstanceState) { SharedPreferencesManager.getInstance().disableKeyCheckerForTesting(); - FeatureUtilities.isBottomToolbarEnabled(); + BottomToolbarConfiguration.isBottomToolbarEnabled(); BraveHelper.DisableFREDRP(); } } diff --git a/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java b/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java index 18ab767affd0..d7783537b591 100644 --- a/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java +++ b/android/java/org/chromium/chrome/browser/externalnav/BraveExternalNavigationHandler.java @@ -5,16 +5,15 @@ package org.chromium.chrome.browser.externalnav; -import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler; -import org.chromium.chrome.browser.externalnav.ExternalNavigationHandler.OverrideUrlLoadingResult; +import org.chromium.components.external_intents.ExternalNavigationDelegate; +import org.chromium.components.external_intents.ExternalNavigationHandler; +import org.chromium.components.external_intents.ExternalNavigationParams; +import org.chromium.components.external_intents.ExternalNavigationHandler.OverrideUrlLoadingResult; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.BraveUphold; public class BraveExternalNavigationHandler extends ExternalNavigationHandler { private BraveUphold mBraveUphold; - public BraveExternalNavigationHandler(Tab tab) { - super(tab); - } public BraveExternalNavigationHandler(ExternalNavigationDelegate delegate) { super(delegate); diff --git a/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java b/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java new file mode 100644 index 000000000000..78186664cfb7 --- /dev/null +++ b/android/java/org/chromium/chrome/browser/homepage/BraveHomepageManager.java @@ -0,0 +1,15 @@ +/* Copyright (c) 2020 The Brave Authors. All rights reserved. + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this file, + * You can obtain one at http://mozilla.org/MPL/2.0/. */ + +package org.chromium.chrome.browser.homepage; + +import org.chromium.chrome.browser.partnercustomizations.CloseBraveManager; + +// see org.brave.bytecode.BraveHomepageManagerClassAdapter +public class BraveHomepageManager { + public static boolean shouldCloseAppWithZeroTabs() { + return CloseBraveManager.shouldCloseAppWithZeroTabs(); + } +} diff --git a/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java b/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java similarity index 82% rename from android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java rename to android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java index e6a81c124ac3..a4fcfea6caef 100644 --- a/android/java/org/chromium/chrome/browser/settings/homepage/BraveHomepageSettings.java +++ b/android/java/org/chromium/chrome/browser/homepage/settings/BraveHomepageSettings.java @@ -3,13 +3,13 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.homepage; +package org.chromium.chrome.browser.homepage.settings; import android.os.Bundle; -import org.chromium.chrome.browser.partnercustomizations.HomepageManager; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; -import org.chromium.chrome.browser.settings.homepage.HomepageSettings; +import org.chromium.chrome.browser.homepage.HomepageManager; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.chrome.browser.homepage.settings.HomepageSettings; public class BraveHomepageSettings extends HomepageSettings { private HomepageManager mHomepageManager; diff --git a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java similarity index 88% rename from android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java rename to android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java index 5cb8687e9746..17205dff168f 100644 --- a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupThemePreference.java +++ b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveRadioButtonGroupThemePreference.java @@ -3,10 +3,10 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.themes; +package org.chromium.chrome.browser.night_mode.settings; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; diff --git a/android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java similarity index 93% rename from android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java rename to android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java index 8d5e63d4c338..6e25573e9550 100644 --- a/android/java/org/chromium/chrome/browser/settings/themes/BraveThemePreferences.java +++ b/android/java/org/chromium/chrome/browser/night_mode/settings/BraveThemePreferences.java @@ -3,22 +3,22 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.themes; +package org.chromium.chrome.browser.night_mode.settings; import static org.chromium.chrome.browser.preferences.ChromePreferenceKeys.UI_THEME_DARKEN_WEBSITES_ENABLED; import static org.chromium.chrome.browser.preferences.ChromePreferenceKeys.UI_THEME_SETTING; import android.os.Bundle; import android.support.annotation.Nullable; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.chrome.R; import org.chromium.base.BuildInfo; import org.chromium.chrome.browser.flags.ChromeFeatureList; import org.chromium.chrome.browser.night_mode.GlobalNightModeStateProviderHolder; +import org.chromium.chrome.browser.night_mode.ThemeType; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -import org.chromium.chrome.browser.settings.SettingsUtils; -import org.chromium.chrome.browser.settings.themes.ThemeType; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge; diff --git a/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java b/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java index 460ae4b17edf..ab1ab1648b65 100644 --- a/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java +++ b/android/java/org/chromium/chrome/browser/notifications/BraveSetDefaultBrowserNotificationService.java @@ -25,7 +25,7 @@ import org.chromium.base.task.PostTask; import org.chromium.base.task.TaskTraits; import org.chromium.chrome.browser.BraveActivity; -import org.chromium.chrome.browser.util.UrlConstants; +import org.chromium.components.embedder_support.util.UrlConstants; import java.util.Calendar; diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java index 2395103f07e0..cf97b0b4de9f 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageView.java @@ -22,7 +22,7 @@ import android.os.Build; import android.text.Spannable; import android.text.SpannableStringBuilder; -import android.support.design.widget.FloatingActionButton; +import com.google.android.material.floatingactionbutton.FloatingActionButton; import java.util.List; import android.view.MenuItem; diff --git a/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java b/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java index 4a247aa6146b..dc43ed499e43 100644 --- a/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java +++ b/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java @@ -13,11 +13,13 @@ import android.text.SpannableString; import android.util.AttributeSet; import android.view.View; +import android.widget.CompoundButton.OnCheckedChangeListener; import android.widget.ImageView; import android.widget.FrameLayout; import org.chromium.base.ApiCompatibilityUtils; import org.chromium.chrome.R; +import org.chromium.components.content_settings.CookieControlsEnforcement; import org.chromium.ui.base.ViewUtils; import org.chromium.ui.text.NoUnderlineClickableSpan; @@ -46,18 +48,19 @@ interface IncognitoNewTabPageManager { void loadIncognitoLearnMore(); /** - * Enables/disables cookie controls mode as set from incognito NTP. By default - * nothing happens. - * @param enable A boolean specifying the state of third party cookie blocking in - * incognito. True will enable third-party cookie blocking in incognito and false - * will disable this feature. + * Initializes the cookie controls manager for interaction with the cookie controls toggle. * */ - void setThirdPartyCookieBlocking(boolean enable); + void initCookieControlsManager(); /** - * Returns whether third-party cookies are currently being blocked. + * Tells the caller whether a new snapshot is required or not. * */ - boolean shouldBlockThirdPartyCookies(); + boolean shouldCaptureThumbnail(); + + /** + * Cleans up the manager after it is finished being used. + * */ + void destroy(); /** * Called when the NTP has completely finished loading (all views will be inflated @@ -135,6 +138,36 @@ void captureThumbnail(Canvas canvas) { mSnapshotScrollY = mScrollView.getScrollY(); } + /** + * Set the visibility of the cookie controls card on the incognito description. + * @param isVisible Whether it's visible or not. + */ + void setIncognitoCookieControlsCardVisibility(boolean isVisible) {} + + /** + * Set the toggle on the cookie controls card. + * @param isChecked Whether it's checked or not. + */ + void setIncognitoCookieControlsToggleChecked(boolean isChecked) {} + + /** + * Set the incognito cookie controls toggle checked change listener. + * @param listener The given checked change listener. + */ + void setIncognitoCookieControlsToggleCheckedListener(OnCheckedChangeListener listener) {} + + /** + * Set the enforcement rule for the incognito cookie controls toggle. + * @param enforcement The enforcement enum to set. + */ + void setIncognitoCookieControlsToggleEnforcement(@CookieControlsEnforcement int enforcement) {} + + /** + * Set the incognito cookie controls icon click listener. + * @param listener The given onclick listener. + */ + void setIncognitoCookieControlsIconOnclickListener(OnClickListener listener) {} + @Override public void onAttachedToWindow() { super.onAttachedToWindow(); diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java b/android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java index 29d2ce02bd1f..5fce7653f9d1 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/RewardsBottomSheetDialogFragment.java @@ -24,9 +24,9 @@ import android.text.TextPaint; import android.content.res.Configuration; -import android.support.design.widget.BottomSheetDialogFragment; -import android.support.design.widget.BottomSheetDialog; -import android.support.design.widget.BottomSheetBehavior; +import com.google.android.material.bottomsheet.BottomSheetDialogFragment; +import com.google.android.material.bottomsheet.BottomSheetDialog; +import com.google.android.material.bottomsheet.BottomSheetBehavior; import android.view.ViewTreeObserver; import org.chromium.chrome.R; @@ -117,7 +117,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat @Override public void onGlobalLayout() { BottomSheetDialog dialog = (BottomSheetDialog) getDialog(); - FrameLayout bottomSheet = (FrameLayout) dialog.findViewById(android.support.design.R.id.design_bottom_sheet); + FrameLayout bottomSheet = (FrameLayout) dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet); BottomSheetBehavior behavior = BottomSheetBehavior.from(bottomSheet); behavior.setState(BottomSheetBehavior.STATE_EXPANDED); } diff --git a/android/java/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java b/android/java/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java index 4414f6e2c647..bdee9fa6cc62 100644 --- a/android/java/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java +++ b/android/java/org/chromium/chrome/browser/ntp_background_images/SuperReferralShareDialogFragment.java @@ -12,7 +12,7 @@ import android.graphics.Bitmap; import android.widget.ImageView; import android.widget.Button; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import com.google.zxing.BarcodeFormat; import com.google.zxing.MultiFormatWriter; diff --git a/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java index 0e1b82a2d20a..fb3bb6201c44 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java +++ b/android/java/org/chromium/chrome/browser/onboarding/BraveRewardsOnboardingFragment.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser.onboarding; -import android.app.Fragment; +import androidx.fragment.app.Fragment; import android.content.Intent; import android.os.Bundle; import android.support.annotation.NonNull; diff --git a/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java index 09be32807b3c..d4f2e0be5db4 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java +++ b/android/java/org/chromium/chrome/browser/onboarding/BraveShieldsOnboardingFragment.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser.onboarding; -import android.app.Fragment; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.text.Spanned; import android.text.method.ScrollingMovementMethod; diff --git a/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java b/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java index 8feb3e535640..8b3f83ca0ac9 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java +++ b/android/java/org/chromium/chrome/browser/onboarding/NonSwipeableViewPager.java @@ -8,7 +8,7 @@ package org.chromium.chrome.browser.onboarding; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.MotionEvent; import android.view.animation.DecelerateInterpolator; diff --git a/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java b/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java index 2b73302929c9..64e46e0fc50d 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java +++ b/android/java/org/chromium/chrome/browser/onboarding/OnboardingActivity.java @@ -9,7 +9,7 @@ import android.content.Intent; import android.os.Bundle; -import android.support.v7.app.AppCompatActivity; +import androidx.appcompat.app.AppCompatActivity; import org.chromium.chrome.R; import org.chromium.chrome.browser.ChromeTabbedActivity; @@ -41,7 +41,7 @@ protected void onCreate(Bundle savedInstanceState) { } OnboardingViewPagerAdapter onboardingViewPagerAdapter = new OnboardingViewPagerAdapter( - this, getFragmentManager(), this, onboardingType, fromSettings); + this, getSupportFragmentManager(), this, onboardingType, fromSettings); viewPager = findViewById(R.id.view_pager); viewPager.setAdapter(onboardingViewPagerAdapter); } diff --git a/android/java/org/chromium/chrome/browser/onboarding/OnboardingViewPagerAdapter.java b/android/java/org/chromium/chrome/browser/onboarding/OnboardingViewPagerAdapter.java index 8f6588506add..1e276e53bc10 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/OnboardingViewPagerAdapter.java +++ b/android/java/org/chromium/chrome/browser/onboarding/OnboardingViewPagerAdapter.java @@ -7,10 +7,10 @@ package org.chromium.chrome.browser.onboarding; -import android.app.Fragment; -import android.app.FragmentManager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentManager; import android.content.Context; -import android.support.v13.app.FragmentPagerAdapter; +import androidx.fragment.app.FragmentPagerAdapter; import org.chromium.chrome.browser.onboarding.OnViewPagerAction; import org.chromium.chrome.browser.onboarding.OnboardingPrefManager; diff --git a/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java index 497608740fec..779c0c73d2d1 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java +++ b/android/java/org/chromium/chrome/browser/onboarding/SearchEngineOnboardingFragment.java @@ -9,7 +9,7 @@ import static org.chromium.ui.base.ViewUtils.dpToPx; -import android.app.Fragment; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; diff --git a/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java b/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java index 18aef2fa8d67..7f4b5aa40e53 100644 --- a/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java +++ b/android/java/org/chromium/chrome/browser/onboarding/TroubleshootingOnboardingFragment.java @@ -7,7 +7,7 @@ package org.chromium.chrome.browser.onboarding; -import android.app.Fragment; +import androidx.fragment.app.Fragment; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; diff --git a/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java b/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java index 8050bfc82de7..2b1893523429 100644 --- a/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java +++ b/android/java/org/chromium/chrome/browser/partnercustomizations/BravePartnerBrowserCustomizations.java @@ -5,9 +5,8 @@ package org.chromium.chrome.browser.partnercustomizations; -public class BravePartnerBrowserCustomizations - extends PartnerBrowserCustomizations { - public static class ProviderPackage implements Provider { +public class BravePartnerBrowserCustomizations { + public static class ProviderPackage implements PartnerBrowserCustomizations.Provider { @Override public String getHomepage() { return null; diff --git a/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java similarity index 91% rename from android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java rename to android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java index 4a5da76c933b..6c08f197e745 100644 --- a/android/java/org/chromium/chrome/browser/settings/privacy/BravePrivacySettings.java +++ b/android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java @@ -3,11 +3,11 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.privacy; +package org.chromium.chrome.browser.privacy.settings; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.base.ContextUtils; import org.chromium.chrome.R; @@ -15,11 +15,11 @@ import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.preferences.Pref; import org.chromium.chrome.browser.preferences.PrefServiceBridge; -import org.chromium.chrome.browser.settings.ChromeBaseCheckBoxPreference; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; -import org.chromium.chrome.browser.settings.ManagedPreferenceDelegate; -import org.chromium.chrome.browser.settings.privacy.PrivacySettings; -import org.chromium.chrome.browser.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.chrome.browser.settings.ChromeManagedPreferenceDelegate; +import org.chromium.chrome.browser.privacy.settings.PrivacySettings; +import org.chromium.components.browser_ui.settings.SettingsUtils; public class BravePrivacySettings extends PrivacySettings { private static final String PREF_HTTPSE = "httpse"; @@ -33,7 +33,7 @@ public class BravePrivacySettings extends PrivacySettings { private static final String PREF_CLEAR_BROWSING_DATA = "clear_browsing_data"; private final PrefServiceBridge mPrefServiceBridge = PrefServiceBridge.getInstance(); - private final ManagedPreferenceDelegate mManagedPreferenceDelegate = + private final ChromeManagedPreferenceDelegate mManagedPreferenceDelegate = createManagedPreferenceDelegate(); private ChromeSwitchPreference mSearchSuggestions; private ChromeSwitchPreference mAutocompleteTopSites; @@ -128,7 +128,7 @@ private void removePreferenceIfPresent(String key) { } } - private ManagedPreferenceDelegate createManagedPreferenceDelegate() { + private ChromeManagedPreferenceDelegate createManagedPreferenceDelegate() { return preference -> { String key = preference.getKey(); if (PREF_SEARCH_SUGGESTIONS.equals(key)) { diff --git a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java index 380489657501..4599136a5cfb 100644 --- a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java +++ b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTracker.java @@ -15,7 +15,7 @@ */ package org.chromium.chrome.browser.qrreader; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceFragmentCompat; import com.google.android.gms.vision.Tracker; import com.google.android.gms.vision.barcode.Barcode; diff --git a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java index de5a0f3b1bf1..fb8a3c6035b5 100644 --- a/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java +++ b/android/java/org/chromium/chrome/browser/qrreader/BarcodeTrackerFactory.java @@ -15,7 +15,7 @@ */ package org.chromium.chrome.browser.qrreader; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceFragmentCompat; import com.google.android.gms.vision.MultiProcessor; import com.google.android.gms.vision.Tracker; diff --git a/android/java/org/chromium/chrome/browser/rate/RateDialogFragment.java b/android/java/org/chromium/chrome/browser/rate/RateDialogFragment.java index 83e2a9de2044..1671e8f4a7bd 100644 --- a/android/java/org/chromium/chrome/browser/rate/RateDialogFragment.java +++ b/android/java/org/chromium/chrome/browser/rate/RateDialogFragment.java @@ -23,7 +23,7 @@ import android.view.animation.Animation; import android.view.animation.AnimationUtils; import android.widget.Toast; -import android.support.v4.app.DialogFragment; +import androidx.fragment.app.DialogFragment; import android.content.DialogInterface; import android.util.DisplayMetrics; import android.content.res.Configuration; diff --git a/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java b/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java index fe7149b81751..07d3f7350464 100644 --- a/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java +++ b/android/java/org/chromium/chrome/browser/rate/RateFeedbackUtils.java @@ -24,8 +24,8 @@ import org.chromium.base.ThreadUtils; import org.chromium.base.ContextUtils; import org.chromium.base.task.AsyncTask; -import org.chromium.chrome.browser.settings.about.AboutChromeSettings; -import org.chromium.chrome.browser.settings.about.AboutSettingsBridge; +import org.chromium.chrome.browser.about_settings.AboutChromeSettings; +import org.chromium.chrome.browser.about_settings.AboutSettingsBridge; import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge; diff --git a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java index 594213b46108..187ae597abb7 100644 --- a/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/AppearancePreferences.java @@ -9,7 +9,7 @@ import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.base.ContextUtils; import org.chromium.chrome.R; @@ -18,10 +18,11 @@ import org.chromium.chrome.browser.BraveRewardsNativeWorker; import org.chromium.chrome.browser.BraveRewardsObserver; import org.chromium.chrome.browser.flags.ChromeFeatureList; -import org.chromium.chrome.browser.flags.FeatureUtilities; import org.chromium.chrome.browser.night_mode.NightModeUtils; import org.chromium.chrome.browser.preferences.BravePreferenceKeys; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.ui.base.DeviceFormFactor; @@ -41,7 +42,7 @@ public void onCreate(Bundle savedInstanceState) { removePreferenceIfPresent(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY); } - if (!NightModeUtils.isNightModeSupported() || !FeatureUtilities.isNightModeAvailable()) { + if (!NightModeUtils.isNightModeSupported()) { removePreferenceIfPresent(PREF_UI_THEME); } @@ -78,7 +79,7 @@ public void onActivityCreated(Bundle savedInstanceState) { ContextUtils.getApplicationContext()); ((ChromeSwitchPreference) enableBottomToolbar) .setChecked(!isTablet - && FeatureUtilities.isBottomToolbarEnabled()); + && BottomToolbarConfiguration.isBottomToolbarEnabled()); } } @@ -105,7 +106,7 @@ public boolean onPreferenceChange(Preference preference, Object newValue) { String key = preference.getKey(); if (BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY.equals(key)) { SharedPreferences prefs = ContextUtils.getAppSharedPreferences(); - Boolean originalStatus = FeatureUtilities.isBottomToolbarEnabled(); + Boolean originalStatus = BottomToolbarConfiguration.isBottomToolbarEnabled(); prefs.edit() .putBoolean(BravePreferenceKeys.BRAVE_BOTTOM_TOOLBAR_ENABLED_KEY, !originalStatus) diff --git a/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java b/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java index bdbb80184c19..b24a83d66592 100644 --- a/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BackgroundImagesPreferences.java @@ -7,8 +7,8 @@ import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; import org.chromium.base.ContextUtils; import org.chromium.chrome.R; @@ -16,6 +16,8 @@ import org.chromium.chrome.browser.preferences.BravePref; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.BraveRelaunchUtils; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; /** * Fragment to keep track of all the display related preferences. diff --git a/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java b/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java index b7cb58b41289..e9eb95153271 100644 --- a/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BackgroundVideoPlaybackPreference.java @@ -6,12 +6,13 @@ package org.chromium.chrome.browser.settings; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRelaunchUtils; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; public class BackgroundVideoPlaybackPreference diff --git a/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java index 6c9a5961b0ac..0a5f4972e029 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveCustomTabsPreference.java @@ -7,13 +7,15 @@ import android.os.Bundle; import android.content.SharedPreferences; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.base.ContextUtils; import org.chromium.chrome.browser.BraveLaunchIntentDispatcher; import org.chromium.chrome.browser.preferences.BravePreferenceKeys; import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.chrome.R; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; public class BraveCustomTabsPreference extends BravePreferenceFragment implements Preference.OnPreferenceChangeListener { diff --git a/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java index e7d7ca4103aa..899a01424892 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveLicensePreferences.java @@ -11,7 +11,8 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRewardsHelper; import org.chromium.chrome.browser.settings.BravePreferenceFragment; -import org.chromium.chrome.browser.settings.TextMessagePreference; +import org.chromium.components.browser_ui.settings.TextMessagePreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import java.io.IOException; import java.io.InputStream; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java index 30fccbf69063..9486f9eb78eb 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveMainPreferencesBase.java @@ -13,7 +13,7 @@ import android.os.Bundle; import android.os.Handler; import android.support.v7.app.AlertDialog; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import android.util.DisplayMetrics; import android.widget.TextView; import android.os.Build; @@ -21,16 +21,18 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveFeatureList; import org.chromium.chrome.browser.flags.ChromeFeatureList; +import org.chromium.chrome.browser.homepage.settings.BraveHomepageSettings; import org.chromium.chrome.browser.onboarding.OnboardingPrefManager; import org.chromium.chrome.browser.preferences.BravePref; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; +import org.chromium.chrome.browser.privacy.settings.BravePrivacySettings; import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory; -import org.chromium.chrome.browser.settings.homepage.BraveHomepageSettings; -import org.chromium.chrome.browser.settings.privacy.BravePrivacySettings; import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.ui.base.DeviceFormFactor; import org.chromium.chrome.browser.ntp_background_images.util.NTPUtil; import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge; +import org.chromium.components.browser_ui.settings.ChromeBasePreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.components.search_engines.TemplateUrl; import org.chromium.components.search_engines.TemplateUrlService; import org.chromium.chrome.browser.rate.RateDialogFragment; @@ -57,6 +59,7 @@ public class BraveMainPreferencesBase extends BravePreferenceFragment { private static final String PREF_BRAVE_REWARDS = "brave_rewards"; private static final String PREF_HOMEPAGE = "homepage"; private static final String PREF_USE_CUSTOM_TABS = "use_custom_tabs"; + private static final String PREF_LANGUAGES = "languages"; private static final String PREF_RATE_BRAVE = "rate_brave"; private final HashMap mRemovedPreferences = new HashMap<>(); @@ -144,7 +147,7 @@ private void rearrangePreferenceOrders() { findPreference(PREF_SYNC).setOrder(++order); findPreference(PREF_ACCESSIBILITY).setOrder(++order); findPreference(PREF_CONTENT_SETTINGS).setOrder(++order); - findPreference(MainSettings.PREF_LANGUAGES).setOrder(++order); + findPreference(PREF_LANGUAGES).setOrder(++order); findPreference(MainSettings.PREF_DATA_REDUCTION).setOrder(++order); findPreference(MainSettings.PREF_DOWNLOADS).setOrder(++order); // This preference doesn't exist by default in Release mode @@ -204,7 +207,7 @@ public boolean onPreferenceClick(Preference preference) { int padding = dp2px(20); titleTextView.setPadding(padding, padding, padding, padding); titleTextView.setTextSize(18); - titleTextView.setTextColor(context.getResources().getColor(R.color.standard_mode_tint)); + titleTextView.setTextColor(context.getResources().getColor(R.color.default_icon_color_tint_list)); titleTextView.setTypeface(null, Typeface.BOLD); AlertDialog alertDialog = new AlertDialog.Builder(context, R.style.Theme_Chromium_AlertDialog) diff --git a/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java b/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java index bcdb1592c6df..f6cf8e4ac583 100644 --- a/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java +++ b/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java @@ -8,7 +8,7 @@ import android.content.Context; import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.v7.preference.PreferenceFragmentCompat; +import androidx.preference.PreferenceFragmentCompat; import android.os.Build; import android.view.Menu; import android.view.MenuInflater; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java b/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java index 087a9b7e8ddf..d5e51a20568a 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveRewardsPreferences.java @@ -7,8 +7,8 @@ import android.content.SharedPreferences; import android.os.Bundle; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; import org.chromium.base.ContextUtils; import org.chromium.chrome.R; @@ -17,6 +17,8 @@ import org.chromium.chrome.browser.BraveRewardsObserver; import org.chromium.chrome.browser.BraveRewardsPanelPopup; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; /** * Fragment to keep track of all Brave Rewards related preferences. diff --git a/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java b/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java index 155c93d1eea9..23ce2662b94e 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreference.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.settings; import android.content.Context; -import android.support.v7.preference.DialogPreference; +import androidx.preference.DialogPreference; import android.util.AttributeSet; import org.chromium.chrome.R; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java b/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java index 16a9b19b2757..fe935e3009b0 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveRewardsResetPreferenceDialog.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.settings; import android.os.Bundle; -import android.support.v7.preference.PreferenceDialogFragmentCompat; +import androidx.preference.PreferenceDialogFragmentCompat; import android.view.View; import org.chromium.chrome.browser.BraveRewardsNativeWorker; diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java b/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java index 2ca41863320e..07a42093bb1f 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineAdapter.java @@ -8,7 +8,7 @@ import android.content.Context; import android.view.View; -import org.chromium.chrome.browser.settings.search_engine.SearchEngineAdapter; +import org.chromium.chrome.browser.search_engines.settings.SearchEngineAdapter; import org.chromium.components.search_engines.TemplateUrl; public class BraveSearchEngineAdapter extends SearchEngineAdapter { diff --git a/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java b/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java index 85e5041e904a..c5bac36b87a5 100644 --- a/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java +++ b/android/java/org/chromium/chrome/browser/settings/BraveSearchEnginePreference.java @@ -10,7 +10,7 @@ import android.view.View; import android.widget.ListView; -import org.chromium.chrome.browser.settings.search_engine.SearchEngineAdapter; +import org.chromium.chrome.browser.search_engines.settings.SearchEngineAdapter; import org.chromium.chrome.R; public class BraveSearchEnginePreference extends ListFragment { diff --git a/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java b/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java index 7be30fcfa9b7..157b1d51ed85 100644 --- a/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java +++ b/android/java/org/chromium/chrome/browser/settings/ClosingAllTabsClosesBravePreference.java @@ -6,10 +6,11 @@ package org.chromium.chrome.browser.settings; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.chrome.R; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; import org.chromium.chrome.browser.partnercustomizations.CloseBraveManager; diff --git a/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java b/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java index e9962a616532..f0505d7b7083 100644 --- a/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java +++ b/android/java/org/chromium/chrome/browser/settings/SearchEngineTabModelSelectorObserver.java @@ -6,6 +6,7 @@ package org.chromium.chrome.browser.settings; import org.chromium.chrome.browser.tab.Tab; +import org.chromium.chrome.browser.tab.TabCreationState; import org.chromium.chrome.browser.tabmodel.TabModel; import org.chromium.chrome.browser.tabmodel.TabModelSelector; import org.chromium.chrome.browser.tabmodel.TabModelSelectorObserver; @@ -26,7 +27,7 @@ public SearchEngineTabModelSelectorObserver(TabModelSelector tabModelSelector) { public void onChange() {} @Override - public void onNewTabCreated(Tab tab) {} + public void onNewTabCreated(Tab tab, @TabCreationState int creationState) {} @Override public void onTabModelSelected(TabModel newModel, TabModel oldModel) { diff --git a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java index f8850f72ef8e..c67e3486cdfb 100644 --- a/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java @@ -14,8 +14,8 @@ import android.content.SharedPreferences; import android.os.Bundle; import android.support.v7.app.AlertDialog; -import android.support.v7.preference.Preference; -import android.support.v7.preference.Preference.OnPreferenceChangeListener; +import androidx.preference.Preference; +import androidx.preference.Preference.OnPreferenceChangeListener; import android.text.InputType; import android.view.LayoutInflater; import android.view.View; @@ -33,8 +33,8 @@ import org.chromium.chrome.browser.BraveRewardsPanelPopup; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.settings.BravePreferenceFragment; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; -import org.chromium.chrome.browser.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.util.BraveDbUtil; /** diff --git a/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java b/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java index 876996821c6c..c4231979bfa1 100644 --- a/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java +++ b/android/java/org/chromium/chrome/browser/settings/developer/BraveRewardsDebugPreferences.java @@ -10,12 +10,12 @@ import android.content.pm.PackageManager; import android.os.Bundle; import android.support.v7.app.AlertDialog; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.chrome.R; import org.chromium.chrome.browser.BraveRelaunchUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; -import org.chromium.chrome.browser.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.util.BraveDbUtil; /** diff --git a/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java b/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java deleted file mode 100644 index 856867a6165f..000000000000 --- a/android/java/org/chromium/chrome/browser/settings/privacy/BraveClearBrowsingDataPreferencesAdvanced.java +++ /dev/null @@ -1,67 +0,0 @@ -/* Copyright (c) 2020 The Brave Authors. All rights reserved. - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this file, - * You can obtain one at http://mozilla.org/MPL/2.0/. */ - -package org.chromium.chrome.browser.settings.privacy; - -import androidx.annotation.DrawableRes; - -import org.chromium.chrome.browser.browsing_data.BrowsingDataType; -import org.chromium.chrome.R; - -public class BraveClearBrowsingDataPreferencesAdvanced extends ClearBrowsingDataFragmentAdvanced { - private static final int CLEAR_DOWNLOADS = DialogOption.NUM_ENTRIES; - - // TODO(samartnik): disabling option as it requires futher research - // At the moment causes issue https://github.com/brave/brave-browser/issues/8737 - // @Override - // protected List getDialogOptions() { - // return Arrays.asList(DialogOption.CLEAR_HISTORY, DialogOption.CLEAR_COOKIES_AND_SITE_DATA, - // DialogOption.CLEAR_CACHE, DialogOption.CLEAR_PASSWORDS, - // DialogOption.CLEAR_FORM_DATA, DialogOption.CLEAR_SITE_SETTINGS, CLEAR_DOWNLOADS); - // } - - // TODO(samartnik): disabling option as it requires futher research - // At the moment causes issue https://github.com/brave/brave-browser/issues/8737 - // @Override - // protected Set getAllOptions() { - // Set all = super.getAllOptions(); - // all.add(CLEAR_DOWNLOADS); - // return all; - // } - - static boolean isValidDataType(int type) { - // TODO(samartnik): disabling option as it requires futher research - // At the moment causes issue https://github.com/brave/brave-browser/issues/8737 - // return type == CLEAR_DOWNLOADS; - return false; - } - - static @BrowsingDataType int getDataType(int type) { - switch (type) { - case CLEAR_DOWNLOADS: - return BrowsingDataType.DOWNLOADS; - default: - throw new IllegalArgumentException(); - } - } - - static String getPreferenceKey(int type) { - switch (type) { - case CLEAR_DOWNLOADS: - return "clear_downloads_checkbox"; - default: - throw new IllegalArgumentException(); - } - } - - static @DrawableRes int getIcon(int type) { - switch (type) { - case CLEAR_DOWNLOADS: - return R.drawable.ic_file_download_24dp; - default: - throw new IllegalArgumentException(); - } - } -} diff --git a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java b/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java index e5bbb79be46b..dd5bc3e6e318 100644 --- a/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java +++ b/android/java/org/chromium/chrome/browser/settings/themes/BraveRadioButtonGroupCustomHomepageThemePreference.java @@ -6,7 +6,7 @@ package org.chromium.chrome.browser.settings.themes; import android.content.Context; -import android.support.v7.preference.PreferenceViewHolder; +import androidx.preference.PreferenceViewHolder; import android.util.AttributeSet; import android.view.View; import android.widget.RadioGroup; @@ -16,6 +16,7 @@ import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.preferences.BravePref; +import org.chromium.chrome.browser.night_mode.settings.RadioButtonGroupThemePreference; import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge; import org.chromium.chrome.browser.BraveRelaunchUtils; diff --git a/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java b/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java index c45f3dc31c2f..239cdbdf058a 100644 --- a/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java +++ b/android/java/org/chromium/chrome/browser/shields/BraveShieldsHandler.java @@ -351,7 +351,7 @@ private void initViews() { private void setUpMainLayout() { String favIconURL = mBraveRewardsNativeWorker.GetPublisherFavIconURL(mTabId); Tab currentActiveTab = BraveRewardsHelper.currentActiveTab(); - String url = currentActiveTab.getUrl(); + String url = currentActiveTab.getUrlString(); final String favicon_url = (favIconURL.isEmpty()) ? url : favIconURL; mIconFetcher.retrieveLargeIcon(favicon_url, this); @@ -466,7 +466,7 @@ public void onClick(View view) { }); ImageView mCookiesIcon = mCookiesLayout.findViewById(R.id.toggle_favicon); mCookiesIcon.setImageResource(R.drawable.ic_chevron_right); - mCookiesIcon.setColorFilter(mContext.getResources().getColor(R.color.standard_mode_tint)); + mCookiesIcon.setColorFilter(mContext.getResources().getColor(R.color.default_icon_color_tint_list)); TextView mCookiesText = mCookiesLayout.findViewById(R.id.toggle_text); mCookiesText.setText(R.string.block_cross_site_cookies); @@ -533,7 +533,7 @@ public void onClick(View view) { }); ImageView mFingerPrintingIcon = mFingerPrintingLayout.findViewById(R.id.toggle_favicon); mFingerPrintingIcon.setImageResource(R.drawable.ic_chevron_right); - mFingerPrintingIcon.setColorFilter(mContext.getResources().getColor(R.color.standard_mode_tint)); + mFingerPrintingIcon.setColorFilter(mContext.getResources().getColor(R.color.default_icon_color_tint_list)); TextView mFingerPrintingText = mFingerPrintingLayout.findViewById(R.id.toggle_text); mFingerPrintingText.setText(R.string.block_cross_site_fingerprinting); diff --git a/android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java b/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java similarity index 93% rename from android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java rename to android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java index 18af76ed170e..b49a947a977e 100644 --- a/android/java/org/chromium/chrome/browser/settings/website/BraveSiteSettingsPreferencesBase.java +++ b/android/java/org/chromium/chrome/browser/site_settings/BraveSiteSettingsPreferencesBase.java @@ -3,19 +3,19 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.website; +package org.chromium.chrome.browser.site_settings; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.base.ContextUtils; import org.chromium.chrome.R; -import org.chromium.chrome.browser.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; import java.util.HashMap; -public class BraveSiteSettingsPreferencesBase extends BravePreferenceFragment { +public class BraveSiteSettingsPreferencesBase extends SiteSettingsPreferenceFragment { private static final String DESKTOP_MODE_CATEGORY_KEY = "desktop_mode_category"; private static final String PLAY_YT_VIDEO_IN_BROWSER_CATEGORY_KEY = "play_yt_video_in_browser_category"; private static final String ADS_KEY = "ads"; diff --git a/android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java b/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java similarity index 85% rename from android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java rename to android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java index df06cc200926..6413d32b009e 100644 --- a/android/java/org/chromium/chrome/browser/settings/website/DesktopModePreferences.java +++ b/android/java/org/chromium/chrome/browser/site_settings/DesktopModePreferences.java @@ -3,15 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.website; +package org.chromium.chrome.browser.site_settings; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.chrome.R; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; -import org.chromium.chrome.browser.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; public class DesktopModePreferences diff --git a/android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java b/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java similarity index 86% rename from android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java rename to android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java index d6a4c10618a7..f4803c8f2c64 100644 --- a/android/java/org/chromium/chrome/browser/settings/website/PlayYTVideoInBrowserPreferences.java +++ b/android/java/org/chromium/chrome/browser/site_settings/PlayYTVideoInBrowserPreferences.java @@ -3,15 +3,15 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.settings.website; +package org.chromium.chrome.browser.site_settings; import android.os.Bundle; -import android.support.v7.preference.Preference; +import androidx.preference.Preference; import org.chromium.chrome.R; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; -import org.chromium.chrome.browser.settings.ChromeSwitchPreference; -import org.chromium.chrome.browser.settings.SettingsUtils; +import org.chromium.components.browser_ui.settings.ChromeSwitchPreference; +import org.chromium.components.browser_ui.settings.SettingsUtils; import org.chromium.chrome.browser.settings.BravePreferenceFragment; public class PlayYTVideoInBrowserPreferences diff --git a/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java b/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java index 352436ebaef1..1be1bf1c42fc 100644 --- a/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java +++ b/android/java/org/chromium/chrome/browser/tabmodel/BraveTabCreator.java @@ -19,18 +19,15 @@ import org.chromium.chrome.browser.preferences.BravePref; import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.profiles.Profile; -import org.chromium.chrome.browser.util.UrlConstants; +import org.chromium.components.embedder_support.util.UrlConstants; import org.chromium.chrome.browser.ntp_background_images.util.SponsoredImageUtil; import org.chromium.chrome.browser.ntp_background_images.NTPBackgroundImagesBridge; public class BraveTabCreator extends ChromeTabCreator { - public BraveTabCreator(ChromeActivity activity, - WindowAndroid nativeWindow, - StartupTabPreloader startupTabPreloader, - Supplier tabDelegateFactory, - boolean incognito) { - super(activity, nativeWindow, startupTabPreloader, tabDelegateFactory, incognito); + public BraveTabCreator(ChromeActivity activity, WindowAndroid nativeWindow, StartupTabPreloader startupTabPreloader, + Supplier tabDelegateFactory, boolean incognito, OverviewNTPCreator overviewNTPCreator) { + super(activity, nativeWindow, startupTabPreloader, tabDelegateFactory, incognito, overviewNTPCreator); } @Override diff --git a/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java b/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java index c7b4390ac83c..dc49d5b699ab 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java +++ b/android/java/org/chromium/chrome/browser/toolbar/BraveHomeButton.java @@ -12,7 +12,7 @@ import android.util.AttributeSet; import org.chromium.chrome.R; -import org.chromium.chrome.browser.partnercustomizations.HomepageManager; +import org.chromium.chrome.browser.homepage.HomepageManager; import org.chromium.chrome.browser.tab.Tab; /** diff --git a/android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java similarity index 93% rename from android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java rename to android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java index 338a095f6a74..38567ef82bae 100644 --- a/android/java/org/chromium/chrome/browser/flags/BraveFeatureUtilities.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarConfiguration.java @@ -1,9 +1,9 @@ -/* Copyright (c) 2019 The Brave Authors. All rights reserved. +/* Copyright (c) 2020 The Brave Authors. All rights reserved. * This Source Code Form is subject to the terms of the Mozilla Public * License, v. 2.0. If a copy of the MPL was not distributed with this file, * You can obtain one at http://mozilla.org/MPL/2.0/. */ -package org.chromium.chrome.browser.flags; +package org.chromium.chrome.browser.toolbar.bottom; import android.app.Activity; import android.content.SharedPreferences; @@ -16,7 +16,7 @@ import org.chromium.chrome.browser.preferences.BravePreferenceKeys; import org.chromium.chrome.browser.preferences.SharedPreferencesManager; -public class BraveFeatureUtilities { +public class BraveBottomToolbarConfiguration { private static final int SMALL_SCREEN_WIDTH = 360; private static final int SMALL_SCREEN_HEIGHT = 640; @@ -57,3 +57,4 @@ private static boolean isSmallScreen() { return (width <= SMALL_SCREEN_WIDTH) && (height <= SMALL_SCREEN_HEIGHT); } } + diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java index c97fd3edd06f..c594b8c1e71e 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarCoordinator.java @@ -13,14 +13,17 @@ import android.view.ViewGroup; import android.view.ViewStub; +import org.chromium.base.Callback; import org.chromium.base.ContextUtils; import org.chromium.base.supplier.ObservableSupplier; +import org.chromium.base.supplier.Supplier; import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.compositor.layouts.EmptyOverviewModeObserver; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; -import org.chromium.chrome.browser.partnercustomizations.HomepageManager; +import org.chromium.chrome.browser.homepage.HomepageManager; +import org.chromium.chrome.browser.share.ShareDelegate; import org.chromium.chrome.browser.toolbar.HomeButton; import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; import org.chromium.chrome.browser.toolbar.TabCountProvider; @@ -38,19 +41,18 @@ public class BraveBottomToolbarCoordinator private SearchAccelerator mSearchAccelerator; private BottomToolbarNewTabButton mNewTabButton; private ActivityTabProvider mBraveTabProvider; - private OnClickListener mOriginalHomeButtonListener; + private Runnable mOriginalHomeButtonRunnable; private final Context mContext = ContextUtils.getApplicationContext(); BraveBottomToolbarCoordinator(ViewStub stub, ActivityTabProvider tabProvider, - OnClickListener homeButtonListener, OnClickListener searchAcceleratorListener, - ObservableSupplier shareButtonListener, - OnLongClickListener tabsSwitcherLongClickListner, - ThemeColorProvider themeColorProvider) { - super(stub, tabProvider, homeButtonListener, searchAcceleratorListener, shareButtonListener, - tabsSwitcherLongClickListner, themeColorProvider); + OnLongClickListener tabsSwitcherLongClickListner, ThemeColorProvider themeColorProvider, + ObservableSupplier shareDelegateSupplier, Supplier showStartSurfaceCallable, + Runnable openHomepageAction, Callback setUrlBarFocusAction) { + super(stub, tabProvider, tabsSwitcherLongClickListner, themeColorProvider, shareDelegateSupplier, + showStartSurfaceCallable, openHomepageAction, setUrlBarFocusAction); mBraveTabProvider = tabProvider; - mOriginalHomeButtonListener = homeButtonListener; + mOriginalHomeButtonRunnable = openHomepageAction; } @Override @@ -80,14 +82,12 @@ public boolean onLongClick(View v) { } @Override - void initializeWithNative(OnClickListener tabSwitcherListener, - OnClickListener newTabClickListener, OnClickListener closeTabsClickListener, + void initializeWithNative(OnClickListener tabSwitcherListener, OnClickListener newTabClickListener, AppMenuButtonHelper menuButtonHelper, OverviewModeBehavior overviewModeBehavior, - TabCountProvider tabCountProvider, IncognitoStateProvider incognitoStateProvider, - ViewGroup topToolbarRoot) { - super.initializeWithNative(tabSwitcherListener, newTabClickListener, closeTabsClickListener, - menuButtonHelper, overviewModeBehavior, tabCountProvider, incognitoStateProvider, - topToolbarRoot); + TabCountProvider tabCountProvider, IncognitoStateProvider incognitoStateProvider, ViewGroup topToolbarRoot, + Runnable closeAllTabsAction) { + super.initializeWithNative(tabSwitcherListener, newTabClickListener, menuButtonHelper, overviewModeBehavior, + tabCountProvider, incognitoStateProvider, topToolbarRoot, closeAllTabsAction); View root = (View) topToolbarRoot.getParent(); View bottom_toolbar_browsing = root.findViewById(R.id.bottom_toolbar_browsing); @@ -100,7 +100,7 @@ void initializeWithNative(OnClickListener tabSwitcherListener, final OnClickListener homeButtonListener = v -> { final boolean isHomepageEnabled = HomepageManager.isHomepageEnabled(); if (isHomepageEnabled) { - mOriginalHomeButtonListener.onClick(v); + mOriginalHomeButtonRunnable.run(); } else { newTabClickListener.onClick(v); } diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java index b8995d9d8e8b..37ce4b63de14 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBottomToolbarVariationManager.java @@ -5,7 +5,7 @@ package org.chromium.chrome.browser.toolbar.bottom; -import org.chromium.chrome.browser.flags.FeatureUtilities; +import org.chromium.chrome.browser.toolbar.bottom.BottomToolbarConfiguration; /** * Brave's extension for BottomToolbarVariationManager @@ -16,12 +16,12 @@ public class BraveBottomToolbarVariationManager private static @Variations String getBraveVariation() { if (sBraveVariation != null) return sBraveVariation; - sBraveVariation = FeatureUtilities.getBottomToolbarVariation(); + sBraveVariation = BOTTOM_TOOLBAR_VARIATION.getValue(); return sBraveVariation; } public static boolean isBraveVariation() { - return FeatureUtilities.isBottomToolbarEnabled() + return BottomToolbarConfiguration.isBottomToolbarEnabled() && getBraveVariation().equals(Variations.NONE); } } diff --git a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java index 4f641f3da60e..a0c138d51fcd 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java +++ b/android/java/org/chromium/chrome/browser/toolbar/bottom/BraveBrowsingModeBottomToolbarCoordinator.java @@ -14,6 +14,7 @@ import org.chromium.chrome.R; import org.chromium.chrome.browser.ActivityTabProvider; import org.chromium.chrome.browser.compositor.layouts.OverviewModeBehavior; +import org.chromium.chrome.browser.tab.TabImpl; import org.chromium.chrome.browser.ThemeColorProvider; import org.chromium.chrome.browser.toolbar.IncognitoStateProvider; import org.chromium.chrome.browser.toolbar.MenuButton; @@ -25,8 +26,6 @@ */ public class BraveBrowsingModeBottomToolbarCoordinator extends BrowsingModeBottomToolbarCoordinator { - private Callback mBookmarkButtonListenerSupplierCallback; - private ObservableSupplier mBookmarkButtonListenerSupplier; private final BrowsingModeBottomToolbarLinearLayout mBraveToolbarRoot; private final ActivityTabProvider mBraveTabProvider; private final BookmarksButton mBookmarkButton; @@ -46,15 +45,14 @@ public class BraveBrowsingModeBottomToolbarCoordinator if (BraveBottomToolbarVariationManager.isBraveVariation()) { mBookmarkButton.setVisibility(View.VISIBLE); getNewTabButtonParent().setVisibility(View.GONE); - - mBookmarkButtonListenerSupplierCallback = bookmarkButtonListener -> { - mBookmarkButton.setOnClickListener(bookmarkButtonListener); + OnClickListener bookmarkClickHandler = v -> { + TabImpl tab = (TabImpl) mBraveTabProvider.get(); + if (tab == null || tab.getActivity() == null) { + return; + } + tab.getActivity().addOrEditBookmark(tab); }; - // To avoid extensive patching we use shareButtonListenerSupplier for both - // share and bookmark buttons. Thus we can't use them both simultaneously. - mBookmarkButtonListenerSupplier = shareButtonListenerSupplier; - mBookmarkButton.setActivityTabProvider(mBraveTabProvider); - mBookmarkButtonListenerSupplier.addObserver(mBookmarkButtonListenerSupplierCallback); + mBookmarkButton.setOnClickListener(bookmarkClickHandler); } mMenuButton = mBraveToolbarRoot.findViewById(R.id.menu_button_wrapper); if (!BottomToolbarVariationManager.isMenuButtonOnBottom()) { @@ -85,9 +83,6 @@ public void updateBookmarkButton(boolean isBookmarked, boolean editingAllowed) { @Override public void destroy() { super.destroy(); - if (mBookmarkButtonListenerSupplier != null) { - mBookmarkButtonListenerSupplier.removeObserver(mBookmarkButtonListenerSupplierCallback); - } mBookmarkButton.destroy(); mMenuButton.destroy(); } diff --git a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java index 4c69010ab107..f13c86b44ede 100644 --- a/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java +++ b/android/java/org/chromium/chrome/browser/toolbar/top/BraveToolbarLayout.java @@ -37,6 +37,7 @@ import org.chromium.chrome.browser.preferences.BravePrefServiceBridge; import org.chromium.chrome.browser.preferences.website.BraveShieldsContentSettings; import org.chromium.chrome.browser.preferences.website.BraveShieldsContentSettingsObserver; +import org.chromium.chrome.browser.profiles.Profile; import org.chromium.chrome.browser.settings.AppearancePreferences; import org.chromium.chrome.browser.tab.Tab; import org.chromium.chrome.browser.tab.TabImpl; @@ -113,7 +114,7 @@ protected void onFinishInflate() { ImageButton forwardButton = findViewById(R.id.forward_button); if (forwardButton != null) { final Drawable forwardButtonDrawable = UiUtils.getTintedDrawable( - getContext(), R.drawable.btn_right_tablet, R.color.standard_mode_tint); + getContext(), R.drawable.btn_right_tablet, R.color.default_icon_color_tint_list); forwardButton.setImageDrawable(forwardButtonDrawable); } } @@ -191,7 +192,6 @@ void onNativeLibraryReady() { SharedPreferences sharedPreferences = ContextUtils.getAppSharedPreferences(); if (ChromeFeatureList.isEnabled(BraveFeatureList.BRAVE_REWARDS) - && !BravePrefServiceBridge.getInstance().getSafetynetCheckFailed() && !sharedPreferences.getBoolean( AppearancePreferences.PREF_HIDE_BRAVE_REWARDS_ICON, false) && mRewardsLayout != null) { @@ -242,7 +242,7 @@ public void onPageLoadFinished(final Tab tab, String url) { public void onDidFinishNavigation(Tab tab, NavigationHandle navigation) { if (getToolbarDataProvider().getTab() == tab && mBraveRewardsNativeWorker != null && !tab.isIncognito()) { - mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrl()); + mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrlString()); } } @@ -258,7 +258,7 @@ public void didSelectTab(Tab tab, @TabSelectionType int type, int lastId) { if (getToolbarDataProvider().getTab() == tab && mBraveRewardsNativeWorker != null && !tab.isIncognito()) { - mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrl()); + mBraveRewardsNativeWorker.OnNotifyFrontTabUrlChanged(tab.getId(), tab.getUrlString()); } } }; @@ -276,13 +276,13 @@ public void onClick(View v) { return; } try { - URL url = new URL(currentTab.getUrl()); + URL url = new URL(currentTab.getUrlString()); // Don't show shields popup if protocol is not valid for shields. if (!isValidProtocolForShields(url.getProtocol())) { return; } - mBraveShieldsHandler.show(mBraveShieldsButton, currentTab.getUrl(), - url.getHost(), currentTab.getId(), ((TabImpl)currentTab).getProfile()); + mBraveShieldsHandler.show(mBraveShieldsButton, currentTab.getUrlString(), + url.getHost(), currentTab.getId(), Profile.fromWebContents(((TabImpl)currentTab).getWebContents())); } catch (Exception e) { // Do nothing if url is invalid. // Just return w/o showing shields popup. @@ -429,7 +429,7 @@ private boolean isShieldsOnForTab(Tab tab) { assert false; return false; } - return BraveShieldsContentSettings.getShields(((TabImpl)tab).getProfile(), tab.getUrl(), + return BraveShieldsContentSettings.getShields(Profile.fromWebContents(((TabImpl)tab).getWebContents()), tab.getUrlString(), BraveShieldsContentSettings.RESOURCE_IDENTIFIER_BRAVE_SHIELDS); } diff --git a/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java b/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java index ebc51ecebbc3..bdedda02a3bc 100644 --- a/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java +++ b/android/java/org/chromium/chrome/browser/upgrade/BraveUpgradeJobIntentService.java @@ -343,7 +343,7 @@ protected void onHandleWork(Intent intent) { // Kick off the migration task only after the browser has // completed startup, as migration requires a profile. PostTask.runOrPostTask(UiThreadTaskTraits.DEFAULT, () -> { - BrowserStartupController.get(LibraryProcessType.PROCESS_BROWSER) + BrowserStartupController.getInstance() .addStartupCompletedObserver(new BrowserStartupController.StartupCallback() { @Override public void onSuccess() { diff --git a/android/java/proguard.flags b/android/java/proguard.flags index 4440300382db..ef39801aff5b 100644 --- a/android/java/proguard.flags +++ b/android/java/proguard.flags @@ -10,4 +10,4 @@ } -keepattributes JavascriptInterface --keep class android.support.design.widget.BottomSheetBehavior { *; } +-keep class com.google.android.material.bottomsheet.BottomSheetBehavior { *; } diff --git a/android/java/res/layout/brave_bookmark_toolbar.xml b/android/java/res/layout/brave_bookmark_toolbar.xml index c4ecf01e61e9..4ca0d31e46ef 100644 --- a/android/java/res/layout/brave_bookmark_toolbar.xml +++ b/android/java/res/layout/brave_bookmark_toolbar.xml @@ -11,7 +11,7 @@ + android:textColor="@color/default_icon_color_tint_list"/> diff --git a/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml b/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml index 982ce19051a8..f167b5a1291e 100644 --- a/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml +++ b/android/java/res/layout/brave_shields_scripts_blocked_switcher.xml @@ -19,7 +19,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/brave_shields_blocks_scripts_switch" - android:textColor="@color/standard_mode_tint" + android:textColor="@color/default_icon_color_tint_list" android:orientation="horizontal" android:paddingStart="10dp" android:gravity="start|center_vertical" diff --git a/android/java/res/layout/brave_shields_switcher.xml b/android/java/res/layout/brave_shields_switcher.xml index bdbd04645a22..56571a476a3a 100644 --- a/android/java/res/layout/brave_shields_switcher.xml +++ b/android/java/res/layout/brave_shields_switcher.xml @@ -15,7 +15,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:textColor="@color/shield_text_color" + android:textColor="@color/default_icon_color_tint_list" android:orientation="horizontal" android:textSize="14sp" android:gravity="start|center_vertical" diff --git a/android/java/res/layout/brave_shields_text_item.xml b/android/java/res/layout/brave_shields_text_item.xml index 9ec79f4cff6f..ad59d4a83fd7 100644 --- a/android/java/res/layout/brave_shields_text_item.xml +++ b/android/java/res/layout/brave_shields_text_item.xml @@ -13,5 +13,5 @@ android:textSize="16sp" android:fontFamily="sans-serif" android:textStyle="normal" - android:textColor="@color/standard_mode_tint" /> + android:textColor="@color/default_icon_color_tint_list" /> diff --git a/android/java/res/layout/brave_shields_thank_you_layout.xml b/android/java/res/layout/brave_shields_thank_you_layout.xml index b3ec7524cae3..63a3d547a7f4 100644 --- a/android/java/res/layout/brave_shields_thank_you_layout.xml +++ b/android/java/res/layout/brave_shields_thank_you_layout.xml @@ -33,7 +33,7 @@ android:textSize="24sp" android:gravity="center_vertical" android:text="@string/thank_you" - android:textColor="@color/standard_mode_tint"/> + android:textColor="@color/default_icon_color_tint_list"/> @@ -41,7 +41,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="16sp" - android:textColor="@color/standard_mode_tint" + android:textColor="@color/default_icon_color_tint_list" android:layout_marginBottom="14dp" android:text="@string/thank_you_text"/> diff --git a/android/java/res/layout/brave_sync_device.xml b/android/java/res/layout/brave_sync_device.xml index 6c79bc6c0e01..425f68ed2305 100644 --- a/android/java/res/layout/brave_sync_device.xml +++ b/android/java/res/layout/brave_sync_device.xml @@ -38,7 +38,7 @@ style="@style/ListItemEndIcon" android:contentDescription="@string/remove" android:src="@drawable/ic_delete_white_24dp" - app:tint="@color/standard_mode_tint" + app:tint="@color/default_icon_color_tint_list" android:layout_centerVertical="true" android:layout_alignParentEnd="true" /> diff --git a/android/java/res/layout/brave_sync_layout.xml b/android/java/res/layout/brave_sync_layout.xml index d09bbccecc11..c895920fd498 100644 --- a/android/java/res/layout/brave_sync_layout.xml +++ b/android/java/res/layout/brave_sync_layout.xml @@ -246,7 +246,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:src="@drawable/copy_paste" - app:tint="@color/standard_mode_tint" + app:tint="@color/default_icon_color_tint_list" android:background="@android:color/transparent" android:contentDescription="@string/brave_sync_word_count_text" android:gravity="end|center" /> diff --git a/android/java/res/layout/fragment_rate_dialog.xml b/android/java/res/layout/fragment_rate_dialog.xml index aece1ef9c4cc..b95c790d88d9 100644 --- a/android/java/res/layout/fragment_rate_dialog.xml +++ b/android/java/res/layout/fragment_rate_dialog.xml @@ -18,7 +18,7 @@ android:layout_margin="16dp" android:text="@string/how_would_you_rate" android:textSize="20sp" - android:textColor="@color/standard_mode_tint" + android:textColor="@color/default_icon_color_tint_list" android:textStyle="bold" /> diff --git a/android/java/res/layout/fragment_super_referral_share.xml b/android/java/res/layout/fragment_super_referral_share.xml index 687f9e0e90b6..68434dfb16ab 100644 --- a/android/java/res/layout/fragment_super_referral_share.xml +++ b/android/java/res/layout/fragment_super_referral_share.xml @@ -22,7 +22,7 @@ android:layout_height="wrap_content" android:gravity="center_horizontal" android:text="@string/share_brave_with_your_friends" - android:textColor="@color/standard_mode_tint" + android:textColor="@color/default_icon_color_tint_list" android:fontFamily="sans-serif" android:textStyle="bold"/> diff --git a/android/java/res/layout/new_tab_page_incognito.xml b/android/java/res/layout/new_tab_page_incognito.xml index 617ae1e798c2..abe51b1e3051 100644 --- a/android/java/res/layout/new_tab_page_incognito.xml +++ b/android/java/res/layout/new_tab_page_incognito.xml @@ -60,7 +60,7 @@ android:layout_height="wrap_content" android:layout_gravity="center_horizontal" android:text="@string/brave_new_tab_private_header" - android:textAppearance="@style/TextAppearance.WhiteHeadline" /> + android:textAppearance="@style/TextAppearance.Headline.Primary.Light" /> + + + + android:textColor="@color/default_icon_color_tint_list"/> @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:textSize="16sp" - android:textColor="@color/standard_mode_tint" + android:textColor="@color/default_icon_color_tint_list" android:text="@string/report_broken_site_text_2"/> + android:textColor="@color/default_icon_color_tint_list"/>