diff --git a/android/BUILD.gn b/android/BUILD.gn index 92c1e3e4813..787be91383d 100644 --- a/android/BUILD.gn +++ b/android/BUILD.gn @@ -155,11 +155,13 @@ android_resources("java_resources") { "java/brave-res/drawable/always_on_tab_selector.xml", "java/brave-res/drawable/always_on_tutorial_action_bg.xml", "java/brave-res/drawable/antenna_layer_list.xml", + "java/brave-res/drawable/bar_chart.xml", "java/brave-res/drawable/bat_ads_logo_button.xml", "java/brave-res/drawable/blue_48_rounded_bg.xml", "java/brave-res/drawable/blue_rounded_notification_bg.xml", "java/brave-res/drawable/bookmark_menu_bg.xml", "java/brave-res/drawable/brave_checkbox.xml", + "java/brave-res/drawable/brave_icon_search.xml", "java/brave-res/drawable/brave_menu_bookmarks.xml", "java/brave-res/drawable/brave_menu_downloads.xml", "java/brave-res/drawable/brave_menu_exit.xml", @@ -212,6 +214,7 @@ android_resources("java_resources") { "java/brave-res/drawable/default_dot.xml", "java/brave-res/drawable/default_indicator.xml", "java/brave-res/drawable/ellipse_217.xml", + "java/brave-res/drawable/email_shield.xml", "java/brave-res/drawable/file_download.xml", "java/brave-res/drawable/file_upload.xml", "java/brave-res/drawable/fingerprint_unlock_layer_list.xml", @@ -432,6 +435,7 @@ android_resources("java_resources") { "java/brave-res/drawable/origin_plan_upgrade_now_bg.xml", "java/brave-res/drawable/password_match.xml", "java/brave-res/drawable/private_tab_gradient_background.xml", + "java/brave-res/drawable/product_origin.xml", "java/brave-res/drawable/product_private_layer_list.xml", "java/brave-res/drawable/product_vpn_layer_list.xml", "java/brave-res/drawable/progress_bar_medium.xml", @@ -697,6 +701,7 @@ android_resources("java_resources") { "java/brave-res/xml/brave_leo_radio_button_group_default_model_preference.xml", "java/brave-res/xml/brave_license_preferences.xml", "java/brave-res/xml/brave_main_preferences.xml", + "java/brave-res/xml/brave_origin_preferences.xml", "java/brave-res/xml/brave_password_settings_preferences.xml", "java/brave-res/xml/brave_playlist_preferences.xml", "java/brave-res/xml/brave_privacy_preferences.xml", diff --git a/android/brave_java_sources.gni b/android/brave_java_sources.gni index d8d2d7d6e34..5670145eba0 100644 --- a/android/brave_java_sources.gni +++ b/android/brave_java_sources.gni @@ -341,6 +341,9 @@ brave_java_sources = [ "../../brave/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesTypeAdapter.java", "../../brave/android/java/org/chromium/chrome/browser/settings/BraveNewsPreferencesV2.java", "../../brave/android/java/org/chromium/chrome/browser/settings/BraveNewsSettingsDividerItemDecoration.java", + "../../brave/android/java/org/chromium/chrome/browser/settings/BraveOriginDescriptionPreference.java", + "../../brave/android/java/org/chromium/chrome/browser/settings/BraveOriginPreferences.java", + "../../brave/android/java/org/chromium/chrome/browser/settings/BraveOriginResetPreference.java", "../../brave/android/java/org/chromium/chrome/browser/settings/BravePreferenceDialogFragment.java", "../../brave/android/java/org/chromium/chrome/browser/settings/BravePreferenceFragment.java", "../../brave/android/java/org/chromium/chrome/browser/settings/BraveSearchEngineUtils.java", diff --git a/android/java/brave-res/drawable/bar_chart.xml b/android/java/brave-res/drawable/bar_chart.xml new file mode 100644 index 00000000000..98b2b282566 --- /dev/null +++ b/android/java/brave-res/drawable/bar_chart.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/android/java/brave-res/drawable/brave_icon_search.xml b/android/java/brave-res/drawable/brave_icon_search.xml new file mode 100644 index 00000000000..8ba1c910c16 --- /dev/null +++ b/android/java/brave-res/drawable/brave_icon_search.xml @@ -0,0 +1,15 @@ + + + + + + diff --git a/android/java/brave-res/drawable/email_shield.xml b/android/java/brave-res/drawable/email_shield.xml new file mode 100644 index 00000000000..5228fc50c58 --- /dev/null +++ b/android/java/brave-res/drawable/email_shield.xml @@ -0,0 +1,16 @@ + + + + + + diff --git a/android/java/brave-res/drawable/product_origin.xml b/android/java/brave-res/drawable/product_origin.xml new file mode 100644 index 00000000000..71b4cc1bc79 --- /dev/null +++ b/android/java/brave-res/drawable/product_origin.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/android/java/brave-res/layout-land/activity_brave_origin_plans.xml b/android/java/brave-res/layout-land/activity_brave_origin_plans.xml index 7e295851fb9..a24a8a75a59 100644 --- a/android/java/brave-res/layout-land/activity_brave_origin_plans.xml +++ b/android/java/brave-res/layout-land/activity_brave_origin_plans.xml @@ -70,20 +70,6 @@ app:drawableStartCompat="@drawable/ic_checkmark_gradient" /> - - - diff --git a/android/java/brave-res/layout/activity_brave_origin_plans.xml b/android/java/brave-res/layout/activity_brave_origin_plans.xml index 79f146ccf6a..83baf01fe2e 100644 --- a/android/java/brave-res/layout/activity_brave_origin_plans.xml +++ b/android/java/brave-res/layout/activity_brave_origin_plans.xml @@ -62,20 +62,6 @@ app:drawableStartCompat="@drawable/ic_checkmark_gradient" /> - - - diff --git a/android/java/brave-res/values/brave_styles.xml b/android/java/brave-res/values/brave_styles.xml index 86dd94fe90b..533a353c9cb 100644 --- a/android/java/brave-res/values/brave_styles.xml +++ b/android/java/brave-res/values/brave_styles.xml @@ -411,6 +411,10 @@ 400 + +