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

Remove resources for cookie consent notices modal

Browse Source
This commit is contained in:
deeppandya
2023-09-20 14:13:41 -04:00
parent 94785957c1
commit 0053ecabfd
29 changed files with 0 additions and 238 deletions
Download Patch File Download Diff File Expand all files Collapse all files
android/brave_java_resources.gni
-17
View File
@@ -46,8 +46,6 @@ brave_java_resources = [
"java/res/drawable-hdpi/ic_ad_free_videos.png",
"java/res/drawable-hdpi/ic_brave_onboarding.png",
"java/res/drawable-hdpi/ic_chrome.png",
"java/res/drawable-hdpi/ic_cookie.png",
"java/res/drawable-hdpi/ic_cookie_background.png",
"java/res/drawable-hdpi/ic_cross_modal.png",
"java/res/drawable-hdpi/ic_delete_white_24dp.png",
"java/res/drawable-hdpi/ic_expand_less_black_24dp.png",
@@ -112,8 +110,6 @@ brave_java_resources = [
"java/res/drawable-mdpi/ic_ad_free_videos.png",
"java/res/drawable-mdpi/ic_brave_onboarding.png",
"java/res/drawable-mdpi/ic_chrome.png",
"java/res/drawable-mdpi/ic_cookie.png",
"java/res/drawable-mdpi/ic_cookie_background.png",
"java/res/drawable-mdpi/ic_cross_modal.png",
"java/res/drawable-mdpi/ic_delete_white_24dp.png",
"java/res/drawable-mdpi/ic_expand_less_black_24dp.png",
@@ -143,13 +139,8 @@ brave_java_resources = [
"java/res/drawable-mdpi/uphold_green.png",
"java/res/drawable-mdpi/uphold_white.png",
"java/res/drawable-mdpi/yandex.png",
"java/res/drawable-night-hdpi/ic_cookie_background.png",
"java/res/drawable-night-mdpi/ic_cookie_background.png",
"java/res/drawable-night-nodpi/ic_quick_action_search_and_bookmark_widget_preview.png",
"java/res/drawable-night-nodpi/widget_preview.png",
"java/res/drawable-night-xhdpi/ic_cookie_background.png",
"java/res/drawable-night-xxhdpi/ic_cookie_background.png",
"java/res/drawable-night-xxxhdpi/ic_cookie_background.png",
"java/res/drawable-night/bookmark_empty_state_illustration.xml",
"java/res/drawable-night/history_empty_state_illustration.xml",
"java/res/drawable-night/phone_recent_tab_empty_state_illustration.xml",
@@ -196,8 +187,6 @@ brave_java_resources = [
"java/res/drawable-xhdpi/ic_ad_free_videos.png",
"java/res/drawable-xhdpi/ic_brave_onboarding.png",
"java/res/drawable-xhdpi/ic_chrome.png",
"java/res/drawable-xhdpi/ic_cookie.png",
"java/res/drawable-xhdpi/ic_cookie_background.png",
"java/res/drawable-xhdpi/ic_cross_modal.png",
"java/res/drawable-xhdpi/ic_delete_white_24dp.png",
"java/res/drawable-xhdpi/ic_expand_less_black_24dp.png",
@@ -261,8 +250,6 @@ brave_java_resources = [
"java/res/drawable-xxhdpi/ic_ad_free_videos.png",
"java/res/drawable-xxhdpi/ic_brave_onboarding.png",
"java/res/drawable-xxhdpi/ic_chrome.png",
"java/res/drawable-xxhdpi/ic_cookie.png",
"java/res/drawable-xxhdpi/ic_cookie_background.png",
"java/res/drawable-xxhdpi/ic_cross_modal.png",
"java/res/drawable-xxhdpi/ic_delete_white_24dp.png",
"java/res/drawable-xxhdpi/ic_expand_less_black_24dp.png",
@@ -325,8 +312,6 @@ brave_java_resources = [
"java/res/drawable-xxxhdpi/ic_ad_free_videos.png",
"java/res/drawable-xxxhdpi/ic_brave_onboarding.png",
"java/res/drawable-xxxhdpi/ic_chrome.png",
"java/res/drawable-xxxhdpi/ic_cookie.png",
"java/res/drawable-xxxhdpi/ic_cookie_background.png",
"java/res/drawable-xxxhdpi/ic_cross_modal.png",
"java/res/drawable-xxxhdpi/ic_delete_white_24dp.png",
"java/res/drawable-xxxhdpi/ic_expand_less_black_24dp.png",
@@ -421,7 +406,6 @@ brave_java_resources = [
"java/res/drawable/chip_outline_selected.xml",
"java/res/drawable/circle_shimmer.xml",
"java/res/drawable/circular_progress.xml",
"java/res/drawable/cookie_consent_tooltip_background.xml",
"java/res/drawable/country_spinner_background.xml",
"java/res/drawable/crypto_wallet_blue_button.xml",
"java/res/drawable/crypto_wallet_hollow_button.xml",
@@ -777,7 +761,6 @@ brave_java_resources = [
"java/res/layout/activity_welcome_onboarding.xml",
"java/res/layout/application_item_layout.xml",
"java/res/layout/approve_tx_bottom_sheet.xml",
"java/res/layout/block_cookie_consent_notices_tooltip.xml",
"java/res/layout/bottom_toolbar.xml",
"java/res/layout/bottom_toolbar_browsing.xml",
"java/res/layout/bottom_toolbar_menu_button.xml",
android/brave_java_sources.gni
-1
View File
@@ -392,7 +392,6 @@ brave_java_sources = [
"../../brave/android/java/org/chromium/chrome/browser/shields/BraveShieldsUtils.java",
"../../brave/android/java/org/chromium/chrome/browser/shields/ContentFilteringAdapter.java",
"../../brave/android/java/org/chromium/chrome/browser/shields/ContentFilteringFragment.java",
"../../brave/android/java/org/chromium/chrome/browser/shields/CookieListOptInServiceFactory.java",
"../../brave/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java",
"../../brave/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java",
"../../brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
android/java/org/chromium/chrome/browser/app/BraveActivity.java
-7
View File
@@ -1539,13 +1539,6 @@ public abstract class BraveActivity extends ChromeActivity
}
}
public void dismissCookieConsent() {
BraveToolbarLayoutImpl layout = getBraveToolbarLayout();
if (layout != null) {
layout.dismissCookieConsent();
}
}
public void openRewardsPanel() {
BraveToolbarLayoutImpl layout = getBraveToolbarLayout();
if (layout != null) {
android/java/org/chromium/chrome/browser/shields/CookieListOptInServiceFactory.java
-64
View File
@@ -1,64 +0,0 @@
/* Copyright (c) 2022 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 https://mozilla.org/MPL/2.0/. */
package org.chromium.chrome.browser.shields;
import org.chromium.base.annotations.JNINamespace;
import org.chromium.base.annotations.NativeMethods;
import org.chromium.brave_shields.mojom.CookieListOptInPageAndroidHandler;
import org.chromium.chrome.browser.crypto_wallet.util.Utils;
import org.chromium.chrome.browser.profiles.Profile;
import org.chromium.mojo.bindings.ConnectionErrorHandler;
import org.chromium.mojo.bindings.Interface;
import org.chromium.mojo.bindings.Interface.Proxy.Handler;
import org.chromium.mojo.system.MessagePipeHandle;
import org.chromium.mojo.system.impl.CoreImpl;
@JNINamespace("chrome::android")
public class CookieListOptInServiceFactory {
private static final Object lock = new Object();
private static CookieListOptInServiceFactory instance;
public static CookieListOptInServiceFactory getInstance() {
synchronized (lock) {
if (instance == null) {
instance = new CookieListOptInServiceFactory();
}
}
return instance;
}
private CookieListOptInServiceFactory() {}
public CookieListOptInPageAndroidHandler getCookieListOptInPageAndroidHandler(
ConnectionErrorHandler connectionErrorHandler) {
Profile profile = Utils.getProfile(false); // Always use regular profile
if (profile == null) {
return null;
}
long nativeHandle =
CookieListOptInServiceFactoryJni.get().getInterfaceToCookieListOptInService(
profile);
if (nativeHandle == -1) {
return null;
}
MessagePipeHandle handle = wrapNativeHandle(nativeHandle);
CookieListOptInPageAndroidHandler cookieListOptInPageAndroidHandler =
CookieListOptInPageAndroidHandler.MANAGER.attachProxy(handle, 0);
Handler handler = ((Interface.Proxy) cookieListOptInPageAndroidHandler).getProxyHandler();
handler.setErrorHandler(connectionErrorHandler);
return cookieListOptInPageAndroidHandler;
}
private MessagePipeHandle wrapNativeHandle(long nativeHandle) {
return CoreImpl.getInstance().acquireNativeHandle(nativeHandle).toMessagePipeHandle();
}
@NativeMethods
interface Natives {
long getInterfaceToCookieListOptInService(Profile profile);
}
}
android/java/org/chromium/chrome/browser/toolbar/BraveToolbarManager.java
-20
View File
@@ -195,26 +195,6 @@ public class BraveToolbarManager extends ToolbarManager {
}
};
HomepageManager.getInstance().addListener(mBraveHomepageStateListener);
mLayoutStateProviderSupplier.onAvailable(
mCallbackController.makeCancelable(this::setLayoutStateProvider));
}
private void setLayoutStateProvider(LayoutStateProvider layoutStateProvider) {
mLayoutStateObserver = new LayoutStateProvider.LayoutStateObserver() {
@Override
public void onStartedShowing(@LayoutType int layoutType) {
if (layoutType == LayoutType.TAB_SWITCHER) {
try {
BraveActivity braveActivity = BraveActivity.getBraveActivity();
braveActivity.dismissCookieConsent();
} catch (BraveActivity.BraveActivityNotFoundException e) {
Log.e(TAG, "setLayoutStateProvider onStartedShowing click " + e);
}
}
}
};
mLayoutStateProvider = layoutStateProvider;
mLayoutStateProvider.addObserver(mLayoutStateObserver);
}
@Override
android/java/res/drawable-hdpi/ic_cookie.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 8.7 KiB

android/java/res/drawable-hdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.4 KiB

android/java/res/drawable-mdpi/ic_cookie.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.6 KiB

android/java/res/drawable-mdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.9 KiB

android/java/res/drawable-night-hdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 4.1 KiB

android/java/res/drawable-night-mdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 2.7 KiB

android/java/res/drawable-night-xhdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 5.7 KiB

android/java/res/drawable-night-xxhdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.0 KiB

android/java/res/drawable-night-xxxhdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 13 KiB

android/java/res/drawable-xhdpi/ic_cookie.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

android/java/res/drawable-xhdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 6.1 KiB

android/java/res/drawable-xxhdpi/ic_cookie.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB

android/java/res/drawable-xxhdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 9.5 KiB

android/java/res/drawable-xxxhdpi/ic_cookie.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 37 KiB

android/java/res/drawable-xxxhdpi/ic_cookie_background.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

android/java/res/drawable/cookie_consent_tooltip_background.xml
-13
View File
@@ -1,13 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2022 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 https://mozilla.org/MPL/2.0/. -->
<layer-list xmlns:android="http://schemas.android.com/apk/res/android" >
<item android:drawable="@drawable/ic_cookie_background" />
<item>
<shape android:shape="rectangle">
<corners android:radius="8dp"/>
</shape>
</item>
</layer-list>
android/java/res/layout/block_cookie_consent_notices_tooltip.xml
-69
View File
@@ -1,69 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (c) 2022 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 https://mozilla.org/MPL/2.0/. -->
<ScrollView
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/shields_tooltip_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/cookie_consent_tooltip_background"
android:fadeScrollbars="false">
<LinearLayout
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical">
<ImageView
android:layout_width="48dp"
android:layout_height="48dp"
android:layout_marginTop="24dp"
android:layout_gravity="center_horizontal"
app:srcCompat="@drawable/ic_cookie"
android:contentDescription="@null" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textSize="24sp"
android:layout_marginTop="22dp"
android:layout_marginBottom="16dp"
android:gravity="center_horizontal"
android:text="@string/block_cookie_notices_title"
android:textColor="@color/cookie_consent_text_color"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="16sp"
android:layout_marginBottom="32dp"
android:gravity="center_horizontal"
android:text="@string/block_cookie_notices_text"
android:textColor="@color/cookie_consent_text_color"/>
<androidx.appcompat.widget.AppCompatButton
android:id="@+id/btn_action"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:gravity="center"
android:background="@drawable/crypto_wallet_blue_button"
android:text="@string/block_cookie_notices_action_text"
android:textAllCaps="false"
android:textSize="14sp"
android:paddingVertical="8dp"
android:paddingBottom="8dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:textColor="@android:color/white"
style="?android:attr/borderlessButtonStyle"/>
</LinearLayout>
</ScrollView>
android/java/res/values-night/brave_colors.xml
-3
View File
@@ -155,9 +155,6 @@
<!-- Brave Wallet DApp -->
<color name="brave_wallet_dapp_text_color">@android:color/white</color>
<color name="cookie_consent_text_color">#F0F2FF</color>
<color name="cookie_consent_tooltip_color">#1E2029</color>
<!-- Quick Action Search and Bookmark Widget -->
<color name="quick_action_search_and_bookmark_widget_bg_color">#F21E2029</color>
<color name="quick_action_search_and_bookmark_widget_search_bg_color">#405E6175</color>
android/java/res/values/brave_colors.xml
-3
View File
@@ -272,9 +272,6 @@
<color name="rewards_tipping_text_color">#212529</color>
<color name="vbat_warning_color">#FFD43B</color>
<color name="cookie_consent_text_color">#212529</color>
<color name="cookie_consent_tooltip_color">@android:color/white</color>
<!-- Quick Action Search and Bookmark Widget -->
<color name="quick_action_search_and_bookmark_widget_bg_color">#F2FFFFFF</color>
<color name="quick_action_search_and_bookmark_widget_search_bg_color">#40AEB1C2</color>
browser/brave_shields/android/cookie_list_opt_in_service_factory_android.cc
-29
View File
@@ -1,29 +0,0 @@
/* Copyright (c) 2022 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/. */
#include "base/android/jni_android.h"
#include "brave/browser/brave_shields/cookie_list_opt_in_service_factory.h"
#include "brave/build/android/jni_headers/CookieListOptInServiceFactory_jni.h"
#include "chrome/browser/profiles/profile.h"
#include "chrome/browser/profiles/profile_android.h"
#include "mojo/public/cpp/bindings/pending_receiver.h"
namespace chrome {
namespace android {
static jlong
JNI_CookieListOptInServiceFactory_GetInterfaceToCookieListOptInService(
JNIEnv* env,
const base::android::JavaParamRef<jobject>& profile_android) {
auto* profile = ProfileAndroid::FromProfileAndroid(profile_android);
if (profile == nullptr)
return static_cast<jlong>(-1);
auto pending = brave_shields::CookieListOptInServiceFactory::GetInstance()
->GetForContext(profile);
return static_cast<jlong>(pending.PassPipe().release().value());
}
} // namespace android
} // namespace chrome
browser/brave_shields/sources.gni
-1
View File
@@ -39,7 +39,6 @@ brave_browser_brave_shields_deps = [
if (is_android) {
brave_browser_brave_shields_sources += [
"//brave/browser/brave_shields/android/cookie_list_opt_in_service_factory_android.cc",
"//brave/browser/brave_shields/android/filter_list_service_factory_android.cc",
"//brave/browser/brave_shields/brave_shields_web_contents_observer_android.cc",
]
browser/ui/android/strings/android_brave_strings.grd
-9
View File
@@ -3351,15 +3351,6 @@ If you don't accept this request, VPN will not reconnect and your internet conne
<message name="IDS_BACKUP_WALLET_PASSWORD" desc="Brave Wallet prompt to enter a password">
Enter your Brave Wallet password
</message>
<message name="IDS_BLOCK_COOKIE_NOTICES_ACTION_TEXT" desc="Block cookie consent notices action text">
Got it
</message>
<message name="IDS_BLOCK_COOKIE_NOTICES_TITLE" desc="Block cookie consent notices title">
Brave is blocking cookie consent notices.
</message>
<message name="IDS_BLOCK_COOKIE_NOTICES_TEXT" desc="Block cookie consent notices text">
Brave already blocks harmful cookies. Now, we automatically block those annoying cookie consent notices, too.
</message>
<message name="IDS_BRAVE_WALLET_SIGN_WARNING" desc="Sign panel warning message">
Note that Brave can't verify what will happen if you sign. A signature could authorize nearly any operation in your account or on your behalf, including (but not limited to) giving total control of your account and crypto assets to the site making the request. Only sign if you're sure you want to take this action, and trust the requesting site.
</message>
build/android/BUILD.gn
-1
View File
@@ -234,7 +234,6 @@ generate_jni("jni_headers") {
"//brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java",
"//brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java",
"//brave/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java",
"//brave/android/java/org/chromium/chrome/browser/shields/CookieListOptInServiceFactory.java",
"//brave/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java",
"//brave/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java",
"//brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",
build/android/config.gni
-1
View File
@@ -132,7 +132,6 @@ brave_jni_headers_sources = [
"//brave/android/java/org/chromium/chrome/browser/preferences/BravePrefServiceBridge.java",
"//brave/android/java/org/chromium/chrome/browser/preferences/website/BraveShieldsContentSettings.java",
"//brave/android/java/org/chromium/chrome/browser/settings/developer/BraveQAPreferences.java",
"//brave/android/java/org/chromium/chrome/browser/shields/CookieListOptInServiceFactory.java",
"//brave/android/java/org/chromium/chrome/browser/shields/FilterListServiceFactory.java",
"//brave/android/java/org/chromium/chrome/browser/shields/UrlSanitizerServiceFactory.java",
"//brave/android/java/org/chromium/chrome/browser/signin/BraveSigninManager.java",