Skip to content

Commit 97877aa

Browse files
pandey019pandey019
authored
Merge pull request #319 from devjangid15/LatestAdBlock
AdReplacement and Blinks fixes
2 parents 0e58643 + 7a58425 commit 97877aa

File tree

63 files changed

+3224
-185
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3224
-185
lines changed

‎src/build/config/android/config.gni

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ if (is_android || is_chromeos) {
9696
# ASAN requires O MR1.
9797
# https://github.com/google/sanitizers/wiki/AddressSanitizerOnAndroid/01f8df1ac1a447a8475cdfcb03e8b13140042dbd#running-with-wrapsh-recommended
9898
if (is_asan) {
99-
min_supported_sdk_version = 27
99+
min_supported_sdk_version = 27
100+
100101
}
101102

102103
assert(
@@ -224,10 +225,10 @@ if (is_android || is_chromeos) {
224225

225226
# Forced Android versionCode
226227

227-
android_override_version_code = "95"
228+
android_override_version_code = "100"
228229

229230
# Forced Android versionName
230-
android_override_version_name = "0.80"
231+
android_override_version_name = "0.82"
231232

232233
# The path to the keystore to use for signing builds.
233234
android_keystore_path = default_android_keystore_path

‎src/chrome/android/BUILD.gn

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -358,6 +358,7 @@ if (current_toolchain == default_toolchain) {
358358
"//chrome/android/webapk/libs/common:common_java",
359359
"//chrome/android/webapk/libs/common:splash_java",
360360
"//chrome/android/webapk/libs/runtime_library:webapk_service_aidl_java",
361+
# "//chrome/browser/endpoint_fetcher:java",
361362
"//chrome/browser/accessibility/hierarchysnapshotter/android:java",
362363
"//chrome/browser/android/auxiliary_search/proto:proto_java",
363364
"//chrome/browser/android/browserservices/intents:java",

‎src/chrome/android/chrome_java_resources.gni

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -549,6 +549,7 @@ chrome_java_resources = [
549549
"java/res/layout/activity_wootz_wallet.xml",
550550
"java/res/layout/activity_network_selector.xml",
551551
"java/res/layout/activity_wootz_wallet_dapps.xml",
552+
"java/res/layout/adblock_editor.xml",
552553
"java/res/layout/app_history_filter.xml",
553554
"java/res/layout/approve_tx_bottom_sheet.xml",
554555
"java/res/layout/auto_sign_in_first_run_dialog.xml",
@@ -835,6 +836,7 @@ chrome_java_resources = [
835836
"java/res/xml/extension_developer_mode_preferences.xml",
836837
"java/res/xml/about_wootzapp_preferences.xml",
837838
"java/res/xml/account_management_preferences.xml",
839+
"java/res/xml/adblock_preferences.xml",
838840
"java/res/xml/ad_services_config.xml",
839841
"java/res/xml/bookmark_widget_info.xml",
840842
"java/res/xml/clear_browsing_data_preferences_tab.xml",

‎src/chrome/android/chrome_java_sources.gni

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -980,6 +980,8 @@ chrome_java_sources = [
980980
"java/src/org/chromium/chrome/browser/permissions/PermissionSettingsBridge.java",
981981
"java/src/org/chromium/chrome/browser/permissions/PermissionUpdateRequester.java",
982982
"java/src/org/chromium/chrome/browser/photo_picker/DecoderServiceImpl.java",
983+
"java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java",
984+
"java/src/org/chromium/chrome/browser/settings/AdBlockPreferences.java",
983985
"java/src/org/chromium/chrome/browser/policy/PolicyAuditor.java",
984986
"java/src/org/chromium/chrome/browser/policy/PolicyAuditorBridge.java",
985987
"java/src/org/chromium/chrome/browser/privacy/settings/DoNotTrackSettings.java",

‎src/chrome/android/java/res/layout/adblock_editor.xml

Lines changed: 67 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,67 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
3+
Use of this source code is governed by a BSD-style license that can be
4+
found in the LICENSE file. -->
5+
6+
<FrameLayout
7+
xmlns:android="http://schemas.android.com/apk/res/android"
8+
xmlns:app="http://schemas.android.com/apk/res-auto"
9+
xmlns:tools="http://schemas.android.com/tools"
10+
android:layout_width="match_parent"
11+
android:layout_height="match_parent" >
12+
13+
<ScrollView
14+
android:layout_width="match_parent"
15+
android:layout_height="match_parent"
16+
android:id="@+id/scroll_view"
17+
android:fillViewport="true" >
18+
19+
<LinearLayout
20+
android:layout_width="match_parent"
21+
android:layout_height="wrap_content"
22+
android:orientation="vertical"
23+
android:focusableInTouchMode="true" >
24+
25+
<com.google.android.material.textfield.TextInputLayout
26+
android:id="@+id/adblock_url"
27+
android:paddingTop="16dp"
28+
android:paddingStart="@dimen/pref_autofill_content_spacing"
29+
android:paddingEnd="@dimen/pref_autofill_content_spacing"
30+
android:layout_width="match_parent"
31+
android:layout_height="wrap_content" >
32+
<!-- TODO(crbug.com/900912): Fix and remove lint ignore -->
33+
<EditText
34+
tools:ignore="Autofill"
35+
android:id="@+id/adblock_url_edit"
36+
android:layout_width="match_parent"
37+
android:layout_height="wrap_content"
38+
android:inputType="textUri"
39+
android:singleLine="true"
40+
android:hint="@string/options_adblock_edit_label" />
41+
</com.google.android.material.textfield.TextInputLayout>
42+
43+
<Space style="@style/ButtonBarTopSpacer" />
44+
<View style="@style/ButtonBarTopDivider" />
45+
46+
<LinearLayout style="@style/ButtonBar" >
47+
<org.chromium.ui.widget.ButtonCompat
48+
android:id="@+id/adblock_reset"
49+
style="@style/ButtonBarButton"
50+
android:text="@string/reset" />
51+
52+
<org.chromium.ui.widget.ButtonCompat
53+
android:id="@+id/adblock_cancel"
54+
style="@style/ButtonBarButton"
55+
android:text="@string/cancel" />
56+
57+
<org.chromium.ui.widget.ButtonCompat
58+
android:id="@+id/adblock_save"
59+
style="@style/ButtonBarButton"
60+
android:text="@string/save" />
61+
</LinearLayout>
62+
</LinearLayout>
63+
</ScrollView>
64+
65+
<include layout="@layout/settings_action_bar_shadow"/>
66+
67+
</FrameLayout>

‎src/chrome/android/java/res/values/styles.xml

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -476,6 +476,24 @@ found in the LICENSE file.
476476
</item>
477477
</style>
478478

479+
<style name="ButtonBarTopSpacer" parent="ButtonBarTopSpacerLight">
480+
<item name="android:minHeight">5dp</item>
481+
</style>
482+
<style name="ButtonBar" parent="@android:style/Holo.Light.ButtonBar.AlertDialog">
483+
<item name="android:layout_width">match_parent</item>
484+
<item name="android:layout_height">wrap_content</item>
485+
<item name="android:divider">?android:attr/dividerVertical</item>
486+
<item name="android:dividerPadding">0dp</item>
487+
<item name="android:showDividers">middle</item>
488+
</style>
489+
<style name="ButtonBarButton" parent="@style/TextButton">
490+
<item name="android:layout_width">0dp</item>
491+
<item name="android:layout_height">match_parent</item>
492+
<item name="android:layout_weight">1</item>
493+
<item name="android:paddingStart">4dp</item>
494+
<item name="android:paddingEnd">4dp</item>
495+
</style>
496+
479497
<!-- Button bar styles -->
480498
<style name="ButtonBarTopSpacerLight">
481499
<item name="android:layout_width">0dp</item>

‎src/chrome/android/java/res/values/values.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ found in the LICENSE file.
1818

1919
<!-- Compositor Tab Title Text -->
2020
<bool name="compositor_tab_title_fake_bold_text">true</bool>
21+
<string name="adblock_help_url">https://github.com/wootzapp/wootz-browser</string>
2122

2223
<!-- Download InfoBar animation. -->
2324
<integer name="download_infobar_fill_in_delay">1200</integer>

‎src/chrome/android/java/res/xml/adblock_preferences.xml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!-- Copyright 2015 The Chromium Authors. All rights reserved.
3+
Use of this source code is governed by a BSD-style license that can be
4+
found in the LICENSE file. -->
5+
6+
<PreferenceScreen
7+
xmlns:android="http://schemas.android.com/apk/res/android"
8+
xmlns:app="http://schemas.android.com/apk/res-auto">
9+
10+
<org.chromium.components.browser_ui.settings.ChromeSwitchPreference
11+
android:key="adblock_switch"
12+
android:summaryOn="@string/text_on"
13+
android:summaryOff="@string/text_off" />
14+
15+
<org.chromium.chrome.browser.about_settings.HyperlinkPreference
16+
android:key="adblock_help"
17+
android:title="@string/adblock_help"
18+
app:url="@string/adblock_help_url" />
19+
20+
<Preference
21+
android:key="adblock_edit"
22+
android:title="@string/options_adblock_edit_label"
23+
android:fragment="org.chromium.chrome.browser.settings.AdBlockEditor" />
24+
25+
</PreferenceScreen>

‎src/chrome/android/java/res/xml/main_preferences.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,11 @@ found in the LICENSE file.
132132
android:key="languages"
133133
android:order="24"
134134
android:title="@string/language_settings"/> -->
135+
<!-- <Preference
136+
android:fragment="org.chromium.chrome.browser.settings.AdBlockPreferences"
137+
android:key="adblock"
138+
android:order="24"
139+
android:title="@string/prefs_adblock"/> -->
135140
<org.chromium.components.browser_ui.settings.ChromeBasePreference
136141
android:fragment="org.chromium.chrome.browser.download.settings.DownloadSettings"
137142
android:key="downloads"

‎src/chrome/android/java/src/org/chromium/chrome/browser/settings/AdBlockEditor.java

Lines changed: 100 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,100 @@
1+
// Copyright 2015 The Chromium Authors. All rights reserved.
2+
// Use of this source code is governed by a BSD-style license that can be
3+
// found in the LICENSE file.
4+
5+
package org.chromium.chrome.browser.settings;
6+
7+
import android.os.Bundle;
8+
import androidx.fragment.app.Fragment;
9+
import android.text.Editable;
10+
import android.text.TextWatcher;
11+
import android.view.LayoutInflater;
12+
import android.view.View;
13+
import android.view.ViewGroup;
14+
import android.widget.Button;
15+
import android.widget.EditText;
16+
import android.util.Log;
17+
18+
import org.chromium.components.browser_ui.settings.SettingsUtils;
19+
import org.chromium.chrome.browser.flags.ChromeFeatureList;
20+
import org.chromium.chrome.R;
21+
import org.chromium.components.url_formatter.UrlFormatter;
22+
23+
/**
24+
* Provides the Java-UI for editing AdBlock preferences.
25+
*/
26+
public class AdBlockEditor extends Fragment implements TextWatcher {
27+
private EditText mAdBlockFiltersUrlEdit;
28+
private Button mSaveButton;
29+
private Button mResetButton;
30+
31+
@Override
32+
public View onCreateView(LayoutInflater inflater, ViewGroup container,
33+
Bundle savedInstanceState) {
34+
super.onCreate(savedInstanceState);
35+
Log.i("AdBlock", "AdBlockEditor onCreateView called");
36+
getActivity().setTitle(R.string.options_adblock_edit_title);
37+
38+
View v = inflater.inflate(R.layout.adblock_editor, container, false);
39+
View scrollView = v.findViewById(R.id.scroll_view);
40+
scrollView.getViewTreeObserver().addOnScrollChangedListener(
41+
SettingsUtils.getShowShadowOnScrollListener(v, v.findViewById(R.id.shadow)));
42+
mAdBlockFiltersUrlEdit = (EditText) v.findViewById(R.id.adblock_url_edit);
43+
String currentUrl = ChromeFeatureList.getAdBlockFiltersURL();
44+
Log.i("AdBlock", "Current AdBlock filters URL: " + currentUrl);
45+
mAdBlockFiltersUrlEdit.setText(currentUrl);
46+
mAdBlockFiltersUrlEdit.addTextChangedListener(this);
47+
mAdBlockFiltersUrlEdit.requestFocus();
48+
49+
initializeSaveCancelResetButtons(v);
50+
return v;
51+
}
52+
53+
@Override
54+
public void beforeTextChanged(CharSequence s, int start, int count, int after) {
55+
}
56+
57+
@Override
58+
public void onTextChanged(CharSequence s, int start, int before, int count) {
59+
Log.i("AdBlock", "URL text changed to: " + s);
60+
mSaveButton.setEnabled(s.length() != 0);
61+
mResetButton.setEnabled(true);
62+
}
63+
64+
@Override
65+
public void afterTextChanged(Editable s) {
66+
}
67+
68+
private void initializeSaveCancelResetButtons(View v) {
69+
mResetButton = (Button) v.findViewById(R.id.adblock_reset);
70+
mResetButton.setOnClickListener(new View.OnClickListener() {
71+
@Override
72+
public void onClick(View v) {
73+
String defaultUrl = ChromeFeatureList.getAdBlockFiltersURL();
74+
Log.i("AdBlock", "Reset clicked, restoring default URL: " + defaultUrl);
75+
mAdBlockFiltersUrlEdit.setText(defaultUrl);
76+
}
77+
});
78+
79+
mSaveButton = (Button) v.findViewById(R.id.adblock_save);
80+
mSaveButton.setEnabled(false);
81+
mSaveButton.setOnClickListener(new View.OnClickListener() {
82+
@Override
83+
public void onClick(View v) {
84+
String newUrl = UrlFormatter.fixupUrl(mAdBlockFiltersUrlEdit.getText().toString()).getSpec();
85+
Log.i("AdBlock", "Save clicked, setting new URL: " + newUrl);
86+
ChromeFeatureList.setAdBlockFiltersURL(newUrl);
87+
getActivity().finish();
88+
}
89+
});
90+
91+
Button button = (Button) v.findViewById(R.id.adblock_cancel);
92+
button.setOnClickListener(new View.OnClickListener() {
93+
@Override
94+
public void onClick(View v) {
95+
Log.i("AdBlock", "Cancel clicked");
96+
getActivity().finish();
97+
}
98+
});
99+
}
100+
}

0 commit comments

Comments
 (0)