Discharge7443/brave-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Android] added missing prefs, strings, default values

Browse Source
This commit is contained in:
Alex C
2021-06-01 23:08:22 -04:00
parent 738a2b7974
commit ef598c3851
5 changed files with 57 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/java/org/chromium/chrome/browser/privacy/settings/BravePrivacySettings.java
+17 -7
View File
@@ -71,6 +71,7 @@ public class BravePrivacySettings extends PrivacySettings {
private static final String PREF_SOCIAL_BLOCKING_LINKEDIN = "social_blocking_linkedin";
private static final String PREF_WEBRTC_POLICY = "webrtc_policy";
private static final String PREF_UNSTOPPABLE_DOMAINS = "unstoppable_domains";
private static final String PREF_ETH_NAMED_SERVICE = "ens";
private static final String PREF_BLOCK_TRACKERS_ADS = "block_trackers_ads";
private static final String PREF_BLOCK_CROSS_SITE_COOKIES = "block_cross_site_cookies";
@@ -79,8 +80,8 @@ public class BravePrivacySettings extends PrivacySettings {
private static final String[] NEW_PRIVACY_PREFERENCE_ORDER = {
PREF_BRAVE_SHIELDS_GLOBALS_SECTION, // shields globals section
PREF_BLOCK_TRACKERS_ADS, PREF_HTTPSE, PREF_BLOCK_SCRIPTS, PREF_BLOCK_CROSS_SITE_COOKIES,
PREF_FINGERPRINTING_PROTECTION, PREF_SHIELDS_SUMMARY,
PREF_SHIELDS_SUMMARY, PREF_BLOCK_TRACKERS_ADS, PREF_HTTPSE, PREF_BLOCK_SCRIPTS,
PREF_BLOCK_CROSS_SITE_COOKIES, PREF_FINGERPRINTING_PROTECTION,
PREF_CLEAR_DATA_SECTION, // clear data automatically section
PREF_CLEAR_ON_EXIT, PREF_CLEAR_BROWSING_DATA,
PREF_BRAVE_SOCIAL_BLOCKING_SECTION, // social blocking section
@@ -88,9 +89,10 @@ public class BravePrivacySettings extends PrivacySettings {
PREF_SOCIAL_BLOCKING_TWITTER, PREF_SOCIAL_BLOCKING_LINKEDIN,
PREF_OTHER_PRIVACY_SETTINGS_SECTION, // other section
PREF_WEBRTC_POLICY, PREF_SAFE_BROWSING, PREF_CAN_MAKE_PAYMENT, PREF_NETWORK_PREDICTIONS,
PREF_SECURE_DNS, PREF_DO_NOT_TRACK, PREF_CLOSE_TABS_ON_EXIT, PREF_SEND_P3A,
PREF_SEARCH_SUGGESTIONS, PREF_AUTOCOMPLETE_TOP_SITES,
PREF_AUTOCOMPLETE_BRAVE_SUGGESTED_SITES, PREF_USAGE_STATS, PREF_PRIVACY_SANDBOX
PREF_UNSTOPPABLE_DOMAINS, PREF_ETH_NAMED_SERVICE, PREF_IPFS_GATEWAY, PREF_SECURE_DNS,
PREF_DO_NOT_TRACK, PREF_CLOSE_TABS_ON_EXIT, PREF_SEND_P3A, PREF_SEARCH_SUGGESTIONS,
PREF_AUTOCOMPLETE_TOP_SITES, PREF_AUTOCOMPLETE_BRAVE_SUGGESTED_SITES, PREF_USAGE_STATS,
PREF_PRIVACY_SANDBOX
};
@@ -108,6 +110,7 @@ public class BravePrivacySettings extends PrivacySettings {
private ChromeSwitchPreference mBlockScriptsPref;
private ChromeSwitchPreference mCloseTabsOnExitPref;
private ChromeSwitchPreference mSendP3A;
private ChromeBaseCheckBoxPreference mIpfsGatewayPref;
private PreferenceCategory mSocialBlockingCategory;
private ChromeSwitchPreference mSocialBlockingGoogle;
private ChromeSwitchPreference mHttpsEverywhere;
@@ -116,6 +119,7 @@ public class BravePrivacySettings extends PrivacySettings {
private ChromeSwitchPreference mSocialBlockingLinkedin;
private ChromeBasePreference mWebrtcPolicy;
private ChromeSwitchPreference mClearBrowsingDataOnExit;
private Preference mUstoppableDomains;
@Override
public void onCreatePreferences(Bundle savedInstanceState, String rootKey) {
@@ -135,6 +139,12 @@ public class BravePrivacySettings extends PrivacySettings {
mAdsTrakersBlockPref = (BraveDialogPreference) findPreference(PREF_BLOCK_TRACKERS_ADS);
mAdsTrakersBlockPref.setOnPreferenceChangeListener(this);
mIpfsGatewayPref = (ChromeBaseCheckBoxPreference) findPreference(PREF_IPFS_GATEWAY);
mIpfsGatewayPref.setOnPreferenceChangeListener(this);
mUstoppableDomains = (Preference) findPreference(PREF_UNSTOPPABLE_DOMAINS);
mUstoppableDomains.setOnPreferenceChangeListener(this);
mBlockCrosssiteCookies =
(BraveDialogPreference) findPreference(PREF_BLOCK_CROSS_SITE_COOKIES);
mBlockCrosssiteCookies.setOnPreferenceChangeListener(this);
@@ -186,9 +196,9 @@ public class BravePrivacySettings extends PrivacySettings {
updatePreferences();
removePreferenceIfPresent(PREF_AD_BLOCK);
removePreferenceIfPresent(PREF_IPFS_GATEWAY);
// removePreferenceIfPresent(PREF_IPFS_GATEWAY);
removePreferenceIfPresent(PREF_SYNC_AND_SERVICES_LINK);
removePreferenceIfPresent(PREF_UNSTOPPABLE_DOMAINS);
// removePreferenceIfPresent(PREF_UNSTOPPABLE_DOMAINS);
}
// used for displaying BraveDialogPreference
android/java/res/drawable/ic_brave.xml
+4 -4
View File
@@ -1,7 +1,7 @@
<vector android:height="16dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="16dp"
<vector android:height="20dp" android:viewportHeight="24"
android:viewportWidth="24" android:width="20dp"
xmlns:aapt="http://schemas.android.com/aapt" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillType="evenOdd" android:pathData="M22.841,7.757L22.0868,5.749L22.6107,4.5955C22.6781,4.447 22.6457,4.2727 22.5292,4.1575L21.1036,2.7432C20.4802,2.1253 19.55,1.9128 18.7122,2.1978L18.3137,2.3333L16.2316,0H13.1686H11.2274H8.5756L6.5202,2.3615L6.1326,2.2278C5.2871,1.936 4.3457,2.1507 3.7183,2.7785L2.2675,4.2193C2.1744,4.3115 2.1489,4.45 2.203,4.5683L2.7504,5.7655L2,7.7725L2.4857,9.582L4.6979,17.8298C4.9526,18.7808 5.5395,19.6135 6.356,20.1838C6.356,20.1838 9.0418,22.0413 11.6923,23.7283C11.9253,23.8768 12.1691,23.9853 12.4307,23.9813C12.6923,23.9848 12.936,23.8768 13.1686,23.7275C16.1454,21.8143 18.5006,20.1763 18.5006,20.1763C19.3162,19.605 19.9022,18.7712 20.1559,17.82L22.3576,9.569L22.841,7.757Z">
<path android:scaleType="fitCenter" android:fillType="evenOdd" android:pathData="M22.841,7.757L22.0868,5.749L22.6107,4.5955C22.6781,4.447 22.6457,4.2727 22.5292,4.1575L21.1036,2.7432C20.4802,2.1253 19.55,1.9128 18.7122,2.1978L18.3137,2.3333L16.2316,0H13.1686H11.2274H8.5756L6.5202,2.3615L6.1326,2.2278C5.2871,1.936 4.3457,2.1507 3.7183,2.7785L2.2675,4.2193C2.1744,4.3115 2.1489,4.45 2.203,4.5683L2.7504,5.7655L2,7.7725L2.4857,9.582L4.6979,17.8298C4.9526,18.7808 5.5395,19.6135 6.356,20.1838C6.356,20.1838 9.0418,22.0413 11.6923,23.7283C11.9253,23.8768 12.1691,23.9853 12.4307,23.9813C12.6923,23.9848 12.936,23.8768 13.1686,23.7275C16.1454,21.8143 18.5006,20.1763 18.5006,20.1763C19.3162,19.605 19.9022,18.7712 20.1559,17.82L22.3576,9.569L22.841,7.757Z">
<aapt:attr name="android:fillColor">
<gradient android:endX="22.841" android:endY="24.1505"
android:startX="2" android:startY="24.1505" android:type="linear">
@@ -13,7 +13,7 @@
</gradient>
</aapt:attr>
</path>
<path android:fillType="evenOdd" android:pathData="M20.4873,8.1551L20.4528,8.2626L20.3979,8.4554C20.2514,8.6344 19.9424,8.978 19.711,9.2193L17.5844,11.4356C17.3531,11.6767 17.2225,11.979 17.3546,12.2836L17.6414,12.9766C17.7731,13.2809 17.7862,13.7845 17.6598,14.1226C17.5313,14.4666 17.3102,14.7707 17.0204,15.0025L16.7984,15.1798C16.5367,15.389 16.073,15.444 15.7678,15.3018L14.7883,14.8462C14.4834,14.7044 14.0283,14.4071 13.7771,14.1856L12.8504,13.369C12.6696,13.2094 12.6594,12.9354 12.8277,12.7639L15.0845,11.2711C15.3644,11.0861 15.5125,10.7438 15.3534,10.452L14.5511,9.0208C14.392,8.7287 14.3284,8.3409 14.4096,8.1586C14.491,7.9763 14.8159,7.7313 15.132,7.614L17.7517,6.6599C18.0676,6.5426 18.0508,6.4216 17.7145,6.3906L16.0405,6.2686C15.7039,6.2376 15.4573,6.2856 15.132,6.3746L13.865,6.6819C13.5397,6.7709 13.4709,7.1102 13.5319,7.4352L14.0546,10.2137C14.1159,10.539 14.1458,10.8666 14.1213,10.9418C14.0968,11.0171 13.8072,11.1384 13.4778,11.2116L13.0445,11.3079C12.715,11.3811 12.1752,11.3844 11.845,11.3156L11.3208,11.2061C10.9904,11.1371 10.7,11.0191 10.6753,10.9441C10.6507,10.8688 10.6804,10.5408 10.7414,10.2157L11.2608,7.4367C11.3218,7.1115 11.2525,6.7726 10.9272,6.6839L9.6597,6.3781C9.3344,6.2893 9.0875,6.2423 8.7512,6.2733L7.0772,6.3968C6.7409,6.4281 6.7243,6.5491 7.0402,6.6659L9.6615,7.6173C9.9774,7.7343 10.3027,7.9788 10.3842,8.1611C10.4659,8.3432 10.4025,8.731 10.244,9.023L9.4431,10.4547C9.2845,10.7468 9.433,11.0891 9.7131,11.2739L11.972,12.7644C12.1405,12.9356 12.1305,13.2099 11.95,13.3695L11.0241,14.1873C10.7733,14.4091 10.3185,14.7067 10.0136,14.8492L9.0349,15.306C8.73,15.4483 8.266,15.394 8.0042,15.1853L7.7823,15.0082C7.492,14.7767 7.2703,14.4729 7.1312,14.1016C7.0147,13.7908 7.027,13.2877 7.1582,12.9829L7.4446,12.2898C7.5761,11.985 7.445,11.6827 7.2134,11.4419L5.0842,9.228C4.8529,8.9873 4.5434,8.644 4.3968,8.4654L4.3414,8.2724L4.3069,8.1649C4.3036,8.0411 4.3488,7.6465 4.4001,7.5398C4.4515,7.4335 4.6481,7.122 4.8373,6.8479L5.2929,6.1876C5.4821,5.9135 5.8092,5.4777 6.0196,5.2189L6.6874,4.3988C6.8978,4.1402 7.0773,3.9297 7.1044,3.9314C7.1056,3.9297 7.3781,3.9794 7.7098,4.0417L8.7213,4.232C9.053,4.2943 9.4189,4.3628 9.5346,4.384C9.65,4.4055 10.0075,4.3395 10.329,4.2375L11.0565,4.0067C11.3777,3.9044 11.8655,3.7699 12.14,3.7074L12.3943,3.7111L12.6487,3.7071C12.9232,3.7692 13.4109,3.9032 13.7324,4.005L14.4604,4.235C14.7819,4.3368 15.1394,4.4023 15.2548,4.3808C15.3541,4.3623 15.6376,4.3087 15.9258,4.2541L16.0679,4.2272L17.0791,4.0362C17.4108,3.9734 17.6833,3.9234 17.7027,3.9249C17.7116,3.9234 17.8911,4.1332 18.102,4.392L18.7708,5.2114C18.9817,5.4697 19.3091,5.905 19.4988,6.179L19.9552,6.8387C20.1446,7.1125 20.4406,7.6108 20.459,7.7241C20.4779,7.8373 20.4904,8.0314 20.4873,8.1551ZM12.5322,14.769C12.5618,14.769 12.8417,14.8723 13.1537,14.9991L13.4433,15.1166C13.7554,15.2431 14.2574,15.4692 14.5585,15.6189L15.4129,16.044C15.7139,16.1935 15.7357,16.4736 15.4609,16.6661L14.7321,17.1767C14.4573,17.3692 14.0253,17.7033 13.7722,17.9198L12.8532,18.7054C12.6009,18.9212 12.1921,18.9222 11.9446,18.7082C11.6969,18.4939 11.2871,18.1431 11.0335,17.9288C10.7802,17.7143 10.3471,17.3827 10.0711,17.1922L9.3449,16.6896C9.0688,16.4986 9.0885,16.2173 9.388,16.0645L10.247,15.6264C10.5466,15.4734 11.0468,15.2444 11.3589,15.1178L11.6484,14.9998C11.9602,14.8731 12.2398,14.769 12.2697,14.769H12.401H12.5322Z">
<path android:scaleType="fitCenter" android:fillType="evenOdd" android:pathData="M20.4873,8.1551L20.4528,8.2626L20.3979,8.4554C20.2514,8.6344 19.9424,8.978 19.711,9.2193L17.5844,11.4356C17.3531,11.6767 17.2225,11.979 17.3546,12.2836L17.6414,12.9766C17.7731,13.2809 17.7862,13.7845 17.6598,14.1226C17.5313,14.4666 17.3102,14.7707 17.0204,15.0025L16.7984,15.1798C16.5367,15.389 16.073,15.444 15.7678,15.3018L14.7883,14.8462C14.4834,14.7044 14.0283,14.4071 13.7771,14.1856L12.8504,13.369C12.6696,13.2094 12.6594,12.9354 12.8277,12.7639L15.0845,11.2711C15.3644,11.0861 15.5125,10.7438 15.3534,10.452L14.5511,9.0208C14.392,8.7287 14.3284,8.3409 14.4096,8.1586C14.491,7.9763 14.8159,7.7313 15.132,7.614L17.7517,6.6599C18.0676,6.5426 18.0508,6.4216 17.7145,6.3906L16.0405,6.2686C15.7039,6.2376 15.4573,6.2856 15.132,6.3746L13.865,6.6819C13.5397,6.7709 13.4709,7.1102 13.5319,7.4352L14.0546,10.2137C14.1159,10.539 14.1458,10.8666 14.1213,10.9418C14.0968,11.0171 13.8072,11.1384 13.4778,11.2116L13.0445,11.3079C12.715,11.3811 12.1752,11.3844 11.845,11.3156L11.3208,11.2061C10.9904,11.1371 10.7,11.0191 10.6753,10.9441C10.6507,10.8688 10.6804,10.5408 10.7414,10.2157L11.2608,7.4367C11.3218,7.1115 11.2525,6.7726 10.9272,6.6839L9.6597,6.3781C9.3344,6.2893 9.0875,6.2423 8.7512,6.2733L7.0772,6.3968C6.7409,6.4281 6.7243,6.5491 7.0402,6.6659L9.6615,7.6173C9.9774,7.7343 10.3027,7.9788 10.3842,8.1611C10.4659,8.3432 10.4025,8.731 10.244,9.023L9.4431,10.4547C9.2845,10.7468 9.433,11.0891 9.7131,11.2739L11.972,12.7644C12.1405,12.9356 12.1305,13.2099 11.95,13.3695L11.0241,14.1873C10.7733,14.4091 10.3185,14.7067 10.0136,14.8492L9.0349,15.306C8.73,15.4483 8.266,15.394 8.0042,15.1853L7.7823,15.0082C7.492,14.7767 7.2703,14.4729 7.1312,14.1016C7.0147,13.7908 7.027,13.2877 7.1582,12.9829L7.4446,12.2898C7.5761,11.985 7.445,11.6827 7.2134,11.4419L5.0842,9.228C4.8529,8.9873 4.5434,8.644 4.3968,8.4654L4.3414,8.2724L4.3069,8.1649C4.3036,8.0411 4.3488,7.6465 4.4001,7.5398C4.4515,7.4335 4.6481,7.122 4.8373,6.8479L5.2929,6.1876C5.4821,5.9135 5.8092,5.4777 6.0196,5.2189L6.6874,4.3988C6.8978,4.1402 7.0773,3.9297 7.1044,3.9314C7.1056,3.9297 7.3781,3.9794 7.7098,4.0417L8.7213,4.232C9.053,4.2943 9.4189,4.3628 9.5346,4.384C9.65,4.4055 10.0075,4.3395 10.329,4.2375L11.0565,4.0067C11.3777,3.9044 11.8655,3.7699 12.14,3.7074L12.3943,3.7111L12.6487,3.7071C12.9232,3.7692 13.4109,3.9032 13.7324,4.005L14.4604,4.235C14.7819,4.3368 15.1394,4.4023 15.2548,4.3808C15.3541,4.3623 15.6376,4.3087 15.9258,4.2541L16.0679,4.2272L17.0791,4.0362C17.4108,3.9734 17.6833,3.9234 17.7027,3.9249C17.7116,3.9234 17.8911,4.1332 18.102,4.392L18.7708,5.2114C18.9817,5.4697 19.3091,5.905 19.4988,6.179L19.9552,6.8387C20.1446,7.1125 20.4406,7.6108 20.459,7.7241C20.4779,7.8373 20.4904,8.0314 20.4873,8.1551ZM12.5322,14.769C12.5618,14.769 12.8417,14.8723 13.1537,14.9991L13.4433,15.1166C13.7554,15.2431 14.2574,15.4692 14.5585,15.6189L15.4129,16.044C15.7139,16.1935 15.7357,16.4736 15.4609,16.6661L14.7321,17.1767C14.4573,17.3692 14.0253,17.7033 13.7722,17.9198L12.8532,18.7054C12.6009,18.9212 12.1921,18.9222 11.9446,18.7082C11.6969,18.4939 11.2871,18.1431 11.0335,17.9288C10.7802,17.7143 10.3471,17.3827 10.0711,17.1922L9.3449,16.6896C9.0688,16.4986 9.0885,16.2173 9.388,16.0645L10.247,15.6264C10.5466,15.4734 11.0468,15.2444 11.3589,15.1178L11.6484,14.9998C11.9602,14.8731 12.2398,14.769 12.2697,14.769H12.401H12.5322Z">
<aapt:attr name="android:fillColor">
<gradient android:endX="19.9647" android:endY="22.4131"
android:startX="12.3973" android:startY="22.4131" android:type="linear">
android/java/res/drawable/ic_rewards.xml
+6 -2
View File
@@ -1,22 +1,26 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="16dp"
android:height="16dp"
android:width="20dp"
android:height="20dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M0.0369,19.9851L6.4777,16.2013L10.9181,8.4195V0.9166C10.801,0.9166 10.6838,0.9947 10.595,1.15L5.3353,10.3679L0.076,19.5858C-0.0127,19.7414 -0.0211,19.8825 0.0369,19.9851Z"
android:fillColor="#FF4724"
android:scaleType="fitCenter"
android:fillType="evenOdd"/>
<path
android:pathData="M10.9181,0.9166V8.4195L15.3582,16.2013L21.799,19.9851C21.8573,19.8825 21.8489,19.7414 21.7602,19.5858L16.5007,10.3679L11.241,1.15C11.1521,0.9945 11.035,0.9166 10.9181,0.9166Z"
android:fillColor="#9E1F63"
android:scaleType="fitCenter"
android:fillType="evenOdd"/>
<path
android:pathData="M21.7991,19.985L15.3583,16.2013H6.4778L0.037,19.985C0.095,20.088 0.2199,20.1519 0.3976,20.1519H21.4382C21.616,20.1519 21.7409,20.088 21.7991,19.985Z"
android:fillColor="#662D91"
android:scaleType="fitCenter"
android:fillType="evenOdd"/>
<path
android:pathData="M6.4778,16.2014H15.3582L10.9181,8.4196L6.4778,16.2014Z"
android:fillColor="#ffffff"
android:scaleType="fitCenter"
android:fillType="evenOdd"/>
</vector>
android/java/res/xml/brave_privacy_preferences.xml
+24 -5
View File
@@ -10,6 +10,11 @@
android:key="brave_shields_globals_section"
android:title="@string/prefs_section_brave_shields_globals"/>
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:key="shields_summary"
android:summary="@string/shields_summary"
android:defaultValue="true" />
<org.chromium.chrome.browser.settings.BraveDialogPreference
android:key="block_trackers_ads"
android:title="@string/block_trackers_ads_title"
@@ -41,10 +46,7 @@
app:dialog_subtitle="@string/block_fingerprinting_text"
app:dialog_entries="@array/blockFingerprintingTexts"
app:dialog_default_index="1" />
<org.chromium.components.browser_ui.settings.ChromeBasePreference
android:key="shields_summary"
android:summary="@string/shields_summary"
android:defaultValue="true" />
<PreferenceCategory
android:key="clear_data_section"
@@ -53,7 +55,7 @@
android:key="clear_on_exit"
android:title="@string/clear_on_exit"
android:summary="@string/clear_on_exit_summary"
android:defaultValue="true" />
android:defaultValue="false" />
<PreferenceCategory
android:key="brave_social_blocking_section"
@@ -88,8 +90,25 @@
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="close_tabs_on_exit"
android:order="25"
defaultValue="false"
android:title="@string/close_tabs_on_exit_title"
android:summary="@string/close_tabs_on_exit_summary" />
<org.chromium.components.browser_ui.settings.ChromeBaseCheckBoxPreference
android:key="ipfs_gateway"
android:order="25"
android:title="@string/ipfs_gateway_title"
android:summary="@string/ipfs_gateway_summary"
android:defaultValue="true" />
<Preference
android:fragment="org.chromium.chrome.browser.decentralized_dns.settings.UnstoppableDomainsSettingsFragment"
android:key="unstoppable_domains"
android:order="25"
android:title="@string/unstoppable_domains_title" />
<Preference
android:fragment="org.chromium.chrome.browser.decentralized_dns.settings.ENSSettingsFragment"
android:key="ens"
android:order="25"
android:title="@string/ens_title" />
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
android:key="search_suggestions"
browser/ui/android/strings/android_brave_strings.grd
+6
View File
@@ -202,6 +202,12 @@ This file contains all "about" strings. It is set to NOT be translated, in tran
<message name="IDS_MENU_EXIT" desc="Menu item for exit browser. [CHAR-LIMIT=27]">
Exit
</message>
<message name="IDS_IPFS_GATEWAY_TITLE" desc="Title for IPFS setting.">
IPFS Gateway
</message>
<message name="IDS_IPFS_GATEWAY_SUMMARY" desc="Summary for IPFS gateway setting.">
Allows for navigation to IPFS resources through an IPFS Gateway
</message>
<message name="IDS_UNSTOPPABLE_DOMAINS_TITLE" desc="Title for Unstoppable Domains settings.">
Unstoppable Domains
</message>