Add Safe Browsing radio button group under the Security page.
When enhanced protection is enabled: http://screen/xCztVbkOydH
When enhanced protection is disabled: http://screen/mAX5c8wZoGV
A managed view of this preference will be added in a future CL.
Callback handling on the expand arrow click event will also be
addressed in a future CL.
Bug: 1097310
Change-Id: Ic5e657bdbcedcf361492215be48a109af33ff1a6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2287275
Reviewed-by: Varun Khaneja <[email protected]>
Reviewed-by: Theresa <[email protected]>
Reviewed-by: Natalie Chouinard <[email protected]>
Commit-Queue: Xinghui Lu <[email protected]>
Cr-Commit-Position: refs/heads/master@{#788449}
diff --git a/chrome/browser/safe_browsing/android/BUILD.gn b/chrome/browser/safe_browsing/android/BUILD.gn
index a4853627..7db45b4 100644
--- a/chrome/browser/safe_browsing/android/BUILD.gn
+++ b/chrome/browser/safe_browsing/android/BUILD.gn
@@ -21,25 +21,49 @@
android_library("java") {
sources = [
"java/src/org/chromium/chrome/browser/safe_browsing/SafeBrowsingBridge.java",
+ "java/src/org/chromium/chrome/browser/safe_browsing/settings/RadioButtonGroupSafeBrowsingPreference.java",
"java/src/org/chromium/chrome/browser/safe_browsing/settings/SecuritySettingsFragment.java",
]
deps = [
":java_resources",
"//base:base_java",
"//base:jni_java",
+ "//chrome/browser/flags:java",
"//components/browser_ui/settings/android:java",
+ "//components/browser_ui/widget/android:java",
"//third_party/android_deps:androidx_fragment_fragment_java",
"//third_party/android_deps:androidx_preference_preference_java",
"//ui/android:ui_full_java",
]
annotation_processor_deps = [ "//base/android/jni_generator:jni_processor" ]
+ srcjar_deps = [ ":safe_browsing_enums" ]
+}
+
+android_library("javatests") {
+ testonly = true
+ sources = [ "javatests/src/org/chromium/chrome/browser/safe_browsing/settings/SecuritySettingsFragmentTest.java" ]
+ deps = [
+ ":java",
+ "//chrome/browser/settings:test_support_java",
+ "//chrome/test/android:chrome_java_test_support",
+ "//components/browser_ui/widget/android:java",
+ "//content/public/test/android:content_java_test_support",
+ "//third_party/junit",
+ ]
}
android_resources("java_resources") {
- sources = [ "java/res/xml/security_preferences.xml" ]
+ sources = [
+ "java/res/layout/radio_button_group_safe_browsing_preference.xml",
+ "java/res/xml/security_preferences.xml",
+ ]
deps = [
"//chrome/browser/ui/android/strings:ui_strings_grd",
"//components/browser_ui/settings/android:java_resources",
]
custom_package = "org.chromium.chrome.browser.safe_browsing.settings"
}
+
+java_cpp_enum("safe_browsing_enums") {
+ sources = [ "//components/safe_browsing/core/common/safe_browsing_prefs.h" ]
+}
