From 03b874e87ca7507b8f50fab00caf671c938e3903 Mon Sep 17 00:00:00 2001 From: nikhil7174 Date: Mon, 4 Nov 2024 01:39:43 +0530 Subject: [PATCH 1/4] android chromium-130 changes --- .../chrome/browser/ntp/BraveNtpAdapter.java | 2 +- .../browser/ntp/IncognitoNewTabPageView.java | 30 +- .../res/layout/new_tab_page_incognito.xml | 20 +- .../android/strings/android_brave_strings.grd | 180 ++++------ .../strings/android_chrome_strings.grd | 313 +++++++++--------- third_party/npm_react-pdf/LICENSE | 21 ++ third_party/npm_react-pdf/README.chromium | 2 +- 7 files changed, 278 insertions(+), 290 deletions(-) create mode 100644 third_party/npm_react-pdf/LICENSE diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java b/android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java index 31c8db6424c5..79e4cf256192 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNtpAdapter.java @@ -120,7 +120,7 @@ public BraveNtpAdapter(Activity activity, OnBraveNtpListener onBraveNtpListener, mIsNewsLoading = isNewsLoading; mRecyclerViewHeight = recyclerViewHeight; mIsTopSitesEnabled = isTopSitesEnabled; - mIsBraveStatsEnabled = isBraveStatsEnabled; + mIsBraveStatsEnabled = false; mIsDisplayNewsFeed = false; mIsDisplayNewsOptin = false; } diff --git a/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java b/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java index eb40f47042fe..004a4c76f522 100644 --- a/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java +++ b/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java @@ -85,21 +85,21 @@ protected void onFinishInflate() { // any shortcut causes the UrlBar to be focused. See ViewRootImpl.leaveTouchMode(). mScrollView.setDescendantFocusability(FOCUS_BEFORE_DESCENDANTS); - mVpnCta = findViewById(R.id.tv_try_vpn); - if (BraveVpnUtils.isVpnFeatureSupported(getContext()) - && !BraveVpnNativeWorker.getInstance().isPurchasedUser()) { - mVpnCta.setOnClickListener( - v -> { - if (!InternetConnection.isNetworkAvailable(getContext())) { - Toast.makeText(getContext(), R.string.no_internet, Toast.LENGTH_SHORT) - .show(); - } else { - BraveVpnUtils.openBraveVpnPlansActivity(getContext()); - } - }); - } else { - mVpnCta.setVisibility(View.GONE); - } + // mVpnCta = findViewById(R.id.tv_try_vpn); + // if (BraveVpnUtils.isVpnFeatureSupported(getContext()) + // && !BraveVpnNativeWorker.getInstance().isPurchasedUser()) { + // mVpnCta.setOnClickListener( + // v -> { + // if (!InternetConnection.isNetworkAvailable(getContext())) { + // Toast.makeText(getContext(), R.string.no_internet, Toast.LENGTH_SHORT) + // .show(); + // } else { + // BraveVpnUtils.openBraveVpnPlansActivity(getContext()); + // } + // }); + // } else { + // mVpnCta.setVisibility(View.GONE); + // } } /** diff --git a/android/java/res/layout/new_tab_page_incognito.xml b/android/java/res/layout/new_tab_page_incognito.xml index 84921c357e49..a38983976c29 100644 --- a/android/java/res/layout/new_tab_page_incognito.xml +++ b/android/java/res/layout/new_tab_page_incognito.xml @@ -43,7 +43,7 @@ app:layout_constraintGuide_end="32dp" /> - + /> --> - + /> --> - + /> --> - + /> --> - + /> --> diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd index ac687484684e..b23f9ef09c7b 100644 --- a/browser/ui/android/strings/android_brave_strings.grd +++ b/browser/ui/android/strings/android_brave_strings.grd @@ -1125,22 +1125,16 @@ This file contains all "about" strings. It is set to NOT be translated, in tran This code is invalid. Please check that the time and timezone are set correctly on your device. - Ping Sync - - - Ping Sync allows you to sync bookmarks data privately between your Ping Browsers on your various devices. - - - Simply scan the code from your sync chain that you created on another device. Or start a new sync chain. + Ping Sync - Using existing synced device, open Ping Settings and navigate to Settings > Sync. Choose "Add New Device" and scan the QR Code displayed on the screen. + Using existing synced device, open Ping Settings and navigate to Settings > Sync. Choose "Add New Device" and scan the QR Code displayed on the screen. - Copied to Clipboard + Copied to Clipboard - Pair + Pair Sync Options @@ -1179,24 +1173,12 @@ This file contains all "about" strings. It is set to NOT be translated, in tran Add a Computer - - Using a second phone or tablet, navigate to Ping Settings > Sync > Scan. - - - On your mobile device, navigate to Ping Sync in the Settings panel and click the button "Scan Sync Code". Use your camera to scan the QR Code below. - - - On your computer, navigate to Ping Settings > Sync. Choose "Enter a Sync Chain Code". - Scan this sync code Treat this code like a password. If someone gets hold of it, they can read and modify your synced data. - - On your target computer, navigate to Ping Sync in settings and click the button "I have a Sync Code".\nEnter the sync chain code words shown below. - Enter the sync chain code @@ -1451,21 +1433,6 @@ Are you sure you want to do this? Photo by %1$s - - Start using Ping Rewards - - - By tapbrave Start using Ping Rewards, you agree to the %1$s. - - - Get paid to see this background image. - - - Hide Sponsored Images - - - You can support web creators with tokens.\nEarn tokens by viewing privacy-respecting ads. - Open external links in Ping @@ -1529,18 +1496,9 @@ Are you sure you want to do this? Earn tokens for viewing this image and pay it forward to creators. %1$s - - Earn tokens for viewing this image. Tap Start using Ping Rewards to claim your share. - You're earning tokens for viewing this image.\n%1$s - - You're earning tokens for viewing this image. - - - Learn more about sponsored images - The payout for %1$s rewards will begin processing by %2$s. @@ -1556,9 +1514,6 @@ Are you sure you want to do this? - - For every sponsored image you view, you receive 70% of the revenue in tokens. With Ping Ads, you're always in control of the ads you see. - Block trackers & ads (Aggressive) @@ -2015,21 +1970,12 @@ Are you sure you want to do this? Get started with Ping Wallet within minutes - - Backup your wallet now! - - - In the next step you’ll see a 12-word recovery phrase, which you can use to recover your primary crypto accounts. Save it someplace safe. Your recovery phrase is the only way to regain account access in case of forgotten password, lost or stolen device, or you want to switch wallets. - Continue Message - - I understand that if I lose my recovery phrase, I won’t be able to access my crypto wallet. - We require that you acknowledge the items below @@ -2042,30 +1988,12 @@ Are you sure you want to do this? I have read and agree to the %1$sTerms of Use%2$s. - - Your recovery phrase - - - Write down or copy these words in the exact order shown below, and save them somewhere safe. Your recovery phrase is the only way to regain account access in case of forgotten password, lost or stolen device, or you want to switch wallets. - WARNING: Never share your recovery phrase. Anyone with this phrase can take your assets forever. - - I have backed up my phrase somewhere safe. - - - Copy - Enter Password - - Verify password - - - Verified password did not match - Creating your wallet… @@ -2108,27 +2036,9 @@ Are you sure you want to do this? Show recovery phrase - - Enter your recovery phrase - - - Paste - - - New Password - Import from legacy Ping crypto wallets? - - Verify recovery phrase - - - Select the words in your recovery phrase in their correct order. - - - Verify - Restore @@ -2204,15 +2114,9 @@ Are you sure you want to do this? Enter password to unlock wallet - - Passwords must be at least 8 characters. - Does not protect you against dangerous websites, downloads, and extensions. - - Phrases did not match. Please try again. - Account recovery failed. Please try again. @@ -2417,9 +2321,6 @@ If you don't accept this request, VPN will not reconnect and your internet conne Server - - Host - Location @@ -3218,9 +3119,6 @@ If you don't accept this request, VPN will not reconnect and your internet conne Updating VPN Profile ... - - Enter your Ping Wallet password - Note that Ping 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. @@ -3638,9 +3536,6 @@ If you don't accept this request, VPN will not reconnect and your internet conne Select all - - Deselect all - Leo @@ -3913,9 +3808,6 @@ If you don't accept this request, VPN will not reconnect and your internet conne All subscriptions are auto-renewed but can be\ncancelled at any time before renewal. - - Upgrade now - Subscription @@ -4088,6 +3980,70 @@ If you don't accept this request, VPN will not reconnect and your internet conne Show undo button when tabs are closed + + + Extra privacy & security online + + + Hide your IP & change your location + + + Hundreds of servers around the world + + + Lightning-fast connection speeds + + + Protect up to 10 devices with one plan + + + Already purchased on brave.com? + + + Refresh your credentials + + + Try 7 days free + + + On your computer, navigate to Brave Settings > Sync. Choose "Enter a Sync Chain Code".\n\nOn your target computer, navigate to Brave Sync in settings and click the button "I have a Sync Code".\nEnter the sync chain code words shown below. + + + Using a second phone or tablet, navigate to Brave Settings > Sync > Scan.\n\nOn your mobile device, navigate to Brave Sync in the Settings panel and click the button "Scan Sync Code". Use your camera to scan the QR Code below. + + + Brave Sync allows you to sync bookmarks data privately between your Brave Browsers on your various devices.\n\nSimply scan the code from your sync chain that you created on another device. Or start a new sync chain. + + + You can skip this step now, but you still need to back up your recovery phrase to ensure account security. + + + I'll back up later + + + Enter a password to continue + + + Enter your Brave Wallet password to start backing up wallet. + + + Save your recovery phrase + + + Your recovery phrase is the key to access your wallet in case you forget your password or lose your device. + + + View my recovery phrase + + + Let's check + + + Include screenshot of the current page + + + This is an error page. It cannot be reported as a broken site. + diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd index 61ae1f20c813..f8f05dedd51f 100644 --- a/browser/ui/android/strings/android_chrome_strings.grd +++ b/browser/ui/android/strings/android_chrome_strings.grd @@ -601,9 +601,33 @@ For more settings that use data to improve your Ping experience, go to Turn off - - - Autofill Options + + + Passwords and Autofill + + + Autofill services + + + Restart Ping + + + Restart Ping? + + + To finish setting up autofill, restart Ping now. Your tabs will automatically reopen. + + + Cancel + + + Your administrator manages this setting. + + + To set your preferred service for autofill, first add the service in <link>Android Settings</link> . + + + Autofill services are also managed in <link>Android Settings</link>. Delete saved security codes? @@ -633,12 +657,12 @@ For more settings that use data to improve your Ping experience, go to %1$sVISA ....1234\u2026 and %2$s1 more} other {%1$sVISA ....1234\u2026 and %2$s2 more}} - + {SHIPPING_ADDRESS, plural, =1 {%1$sJerry, 1253 Mcgill college\u2026 and %2$s1 more} other {%1$sJerry, 1253 Mcgill college\u2026 and %2$s2 more}} - + {SHIPPING_OPTIONS, plural, =1 {%1$sstandard shipping\u2026 and %2$s1 more} other {%1$sstandard shipping\u2026 and %2$s2 more}} @@ -701,9 +725,6 @@ For more settings that use data to improve your Ping experience, go to Warn you if passwords are exposed in a data breach - - Warn you if a password was compromised in a data breach - When you use a password, Ping warns you if it has been published online. When doing this, your passwords and usernames are encrypted, so they can’t be read by anyone, including Ping. @@ -920,6 +941,9 @@ For more settings that use data to improve your Ping experience, go to Your lists of saved passwords for Ping and %1$sPing Dev were merged. You can still autofill all your saved passwords on both apps. + + All passwords saved only to this device for Ping and %1$sPing Dev were merged. You can autofill all your saved passwords on both apps. + Delete passwords from Ping Password Manager? @@ -948,13 +972,13 @@ For more settings that use data to improve your Ping experience, go to - Passwords will stop working soon on this device. To keep using your passwords, update Google Play services. + Passwords may stop working soon on this device. To keep using your passwords, update Google Play services. Fix problem with saved passwords - Some passwords saved only on this device will stop working soon. You can move these passwords to Ping Password Manager. + Some passwords on this device will stop working soon. You can move these passwords to Ping Password Manager. Fix now @@ -989,8 +1013,8 @@ For more settings that use data to improve your Ping experience, go to Take me there - - Some passwords will stop working soon + + Passwords will stop working soon @@ -1062,7 +1086,7 @@ For more settings that use data to improve your Ping experience, go to Customize the info used by sites to show you ads - + Touch to Search @@ -1169,12 +1193,6 @@ For example, some websites may respond to this request by showing you ads that a - - Topics you blocked - - - You can block topics you don't want shared with sites. Ping also auto-deletes your topics older than 4 weeks. <link>Learn more</link> - Ping auto-deletes topics that are older than 4 weeks. As you keep browsing, a topic might reappear on the list. Or you can block topics you don’t want Ping to share with sites. Learn more about <link>managing your ad privacy in Ping.</link> @@ -1184,9 +1202,6 @@ For example, some websites may respond to this request by showing you ads that a Blocked topic - - Added topic back to potential topics - @@ -1452,10 +1467,10 @@ Your Ping account may have other forms of browsing history like searches and act Basic - Some of your web history might not show up here. To see a full web history, tap Open full Ping history. + Some of your history might not show up here. To see all your Ping history, open full Ping history. - Some of your web history might not show up here. If needed, tap Open full Ping history. Also, Your Ping sync chain may have other forms of browsing history at <link>myactivity.google.com</link>. + Some of your history might not show up here. To see all your Ping history, open full Ping history. Also, your Ping sync chain may have other forms of browsing history at <link>myactivity.google.com</link>. Your Ping sync chain may have other forms of browsing history at <link>myactivity.google.com</link>. @@ -1588,6 +1603,27 @@ Your Ping account may have other forms of browsing history like searches and act Choose whether to include Ping history for more personalized experiences in Ping services + + Learn more. + + + View screenshot + + + <link1>Clear Brave Ads data…</link1> + + + <link1>Reset Brave Rewards data…</link1> + + + Recovery phrase doesn't match + + + Enter the word in position %1$s from your recovery phrase. + + + Word #%1$s + Privacy guide explanation @@ -1600,42 +1636,6 @@ Your Ping account may have other forms of browsing history like searches and act Privacy guide explanation closed - - Detects and warns you about dangerous events when they happen - - - Checks URLs with a list of unsafe sites stored in Ping - - - Sends an obfuscated portion of the URL to Ping through a privacy server that hides your IP address - - - If a site tries to steal your password, or when you download a harmful file, Ping may send URLs including bits of page content to Safe Browsing - - - If a site tries to steal your password, or when you download a harmful file, Ping may send URLs including bits of page content to Ping - - - Predicts and warns you about dangerous events before they happen - - - Keeps you safe on Ping and may be used to improve your security in other Ping apps when you are signed in - - - Improves security for you and everyone on the web - - - Warns you if passwords are exposed in a data breach - - - Sends URLs to Safe Browsing to check them - - - Also sends a small sample of pages, downloads, extension activity, and system information to help discover new threats - - - Temporarily links this data to your Ping sync chain when you’re signed in, to protect you across Ping apps - When you tap or type in the address bar or search box, you'll see suggestions from your default search engine. This is off in Private. @@ -1984,16 +1984,13 @@ Your Ping account may have other forms of browsing history like searches and act Faster, proactive protection against dangerous websites, downloads, and extensions. Warns you about password breaches. Requires browsing data to be sent to Ping. - - Real-time, proactive protection against dangerous sites, downloads, and extensions that’s based on your browsing data getting sent to Ping - Standard protection Protects against sites, downloads, and extensions that are known to be dangerous. If a page does something suspicious, URLs and bits of page content are sent to Google Safe Browsing. - + Protects against sites, downloads, and extensions that are known to be dangerous. When you visit a site, Ping sends an obfuscated portion of the URL to Ping through a privacy server that hides your IP address. If a site does something suspicious, full URLs and bits of page content are also sent. @@ -2002,9 +1999,6 @@ Your Ping account may have other forms of browsing history like searches and act Does not protect you against dangerous websites, downloads, and extensions. You’ll still get Safe Browsing protection, where available, in other Ping services, like Gmail and Search. - - Does not protect you against dangerous websites, downloads, and extensions. Your Safe Browsing settings in other Ping products won't be affected. - @@ -2013,34 +2007,23 @@ Your Ping account may have other forms of browsing history like searches and act Predicts and warns you about dangerous events before they happen. - - Warns you about dangerous sites, even ones Ping didn’t know about before, by analyzing more data from sites than standard protection. You can choose to skip Ping warnings. - Keeps you safe on Ping and may be used to improve your security in other Ping apps when you are signed in. - - In-depth scans for suspicious downloads. - + Improves security for you and everyone on the web. - - When you're signed in, protects you across Ping services. - Improves security for you and everyone on the web. Sends URLs to Safe Browsing to check them. Also sends a small sample of pages, downloads, extension activity, and system information to help discover new threats. Temporarily links this data to your Ping sync chain when you’re signed in, to protect you across Ping apps. - - Warns you if you use a password that has been compromised in a data breach. - Sends the URLs of sites you visit and a small sample of page content, downloads, extension activity, and system information to Google Safe Browsing to check if they’re harmful. - + When you’re signed in, this data is linked to your Ping sync chain to protect you across Ping services, for example increasing protection in Gmail after a security incident. @@ -2060,11 +2043,11 @@ Your Ping account may have other forms of browsing history like searches and act App filter sheet - - Checks URLs with a list of unsafe sites stored in Ping. If a site tries to steal your password, or when you download a harmful file, Ping may also send URLs, including bits of page content, to Safe Browsing. + + App filter sheet is opened. - - Sends an obfuscated portion of the URL to Ping through a privacy server that hides your IP address. If a site tries to steal your password, or when you download a harmful file, Ping may also send URLs, including bits of page content, to Ping. + + App filter sheet is closed. @@ -2162,7 +2145,7 @@ Your Ping account may have other forms of browsing history like searches and act Advanced - + Translate into this language @@ -2477,7 +2460,7 @@ Your Ping account may have other forms of browsing history like searches and act Your bookmarks, history, and other Ping data will no longer be synced to your Ping sync chain - Also clear your Ping data from this device + Also delete your Ping data from this device Because you're signing out of an account managed by %1$sgoogle.com, your Ping data will be deleted from this device. It will remain in your Ping sync chain. @@ -2517,9 +2500,6 @@ Your Ping account may have other forms of browsing history like searches and act Sign in to managed account - - You are signing in with an account managed by %1$sPing and giving its administrator control over your Ping data. Your data will become permanently tied to this account. Signing out of Ping will delete your data from this device, but it will remain stored in your Ping sync chain. - Your organization, %1$sPing, manages the account you're signing in to and how Ping can be used. Your administrator can set up or restrict certain features. @@ -2580,9 +2560,8 @@ Your Ping account may have other forms of browsing history like searches and act Apps - - - When on, data is saved in your Ping sync chain. When off, data is saved only to this device. + + Payment methods, offers, and addresses using Google Pay In your Ping sync chain @@ -2617,12 +2596,6 @@ Your Ping account may have other forms of browsing history like searches and act Control your data & account - - Ping activity controls - - - Control how your browsing history is used to personalize Search and more - Encryption @@ -2644,15 +2617,9 @@ Your Ping account may have other forms of browsing history like searches and act Review your account data - - Manage your Ping sync chain - Manage accounts on this device - - Sign out - Save in account @@ -2721,9 +2688,13 @@ Your Ping account may have other forms of browsing history like searches and act Enter passphrase - - Payment methods and addresses from Google Pay won’t be encrypted. Browsing history from Ping won’t sync. + + Payment methods and addresses won’t be encrypted. Browsing history from Ping won’t sync. Only someone with your passphrase can read your encrypted data. The passphrase is not sent to or stored by Ping. If you forget your passphrase or want to change this setting, BEGIN_LINKclear the Ping data in your accountEND_LINK. + + + Payment methods and addresses from Google Pay won’t be encrypted. Browsing history from Ping won’t sync. +Only someone with your passphrase can read your encrypted data. The passphrase is not sent to or stored by Ping. If you forget your passphrase or want to change this setting, BEGIN_LINKdelete the Ping data in your accountEND_LINK. Passphrase @@ -2741,7 +2712,7 @@ Only someone with your passphrase can read your encrypted data. The passphrase i This field cannot be blank - If you forgot your passphrase or want to change this setting, BEGIN_LINKclear the Ping data in your accountEND_LINK. + If you forgot your passphrase or want to change this setting, BEGIN_LINKdelete the Ping data in your accountEND_LINK. Passphrases do not match @@ -3128,7 +3099,7 @@ To change this setting, BEGIN_LINKclear the Ping data Translate image with Google Lens <new>New</new> - + Shop image with Google Lens <new>New</new> @@ -3655,11 +3626,13 @@ To change this setting, BEGIN_LINKclear the Ping data Info is sent to Ping about your Ping usage, but it isn\u2019t tied to you\n\nIf Ping crashes, details about the crash may include some personal info\n\nIf you turn on sync, metrics may also include info about URLs you visit - - - Make Ping your own + + Info is sent to Ping about your Ping usage, but it isn\u2019t tied to you\n\nIf Ping crashes, details about the crash may include some personal info\n\nIf you sync your history to your Ping sync chain, metrics may also include info about URLs you visit + + + Make Ping your own - + Sign in to browse easier across devices @@ -3717,7 +3690,7 @@ To change this setting, BEGIN_LINKclear the Ping data Opening Ping without a profile lock will remove your saved passwords and payment methods from the car. Using a profile lock keeps this data secure. - Also clear bookmarks, history, and more from this car + Also delete bookmarks, history, and more from this car Delete & continue @@ -3745,12 +3718,17 @@ To change this setting, BEGIN_LINKclear the Ping data You can always choose what to sync in <LINK1>settings</LINK1>. - - - You are signed in as %1$sjane.doe@example.com. You can always choose what to sync in settings. Ping may personalize Search and other services based on your history. + + You are signed in as %1$sjane.doe@example.com. You can stop syncing anytime in settings. Ping may personalize Search and other services based on your history. + + + You can stop syncing anytime in settings. Ping may personalize Search and other services based on your history. + + + Yes, I’m in - - You can always choose what to sync in settings. Ping may personalize Search and other services based on your history. + + No thanks Yes, I'm in @@ -3779,6 +3757,9 @@ To change this setting, BEGIN_LINKclear the Ping data Sign in to Ping + + Sign in to Ping + Sign in to Ping, opened. @@ -3850,8 +3831,11 @@ To change this setting, BEGIN_LINKclear the Ping data Sync to get your bookmarks from your other devices - - Sign in to get your bookmarks and more from your other devices + + Get all your bookmarks + + + Sign in to get your bookmarks and more on all your devices Get better suggestions @@ -3859,6 +3843,12 @@ To change this setting, BEGIN_LINKclear the Ping data Sync to get the most relevant content from Ping + + Get better content + + + Sign in to get content based on your interests + Get all your tabs @@ -4479,7 +4469,7 @@ To change this setting, BEGIN_LINKclear the Ping data URL required - + Bookmark save flow @@ -4822,12 +4812,6 @@ To change this setting, BEGIN_LINKclear the Ping data Go to Settings - - Ping will remember your choice - - - When you select desktop site once, the setting is applied to the site each time you visit - You can request the desktop site for %1$swww.example.com @@ -4871,22 +4855,22 @@ To change this setting, BEGIN_LINKclear the Ping data Open tabs to visit different pages at the same time - - Switch or close tabs + + tab switcher - + Manage account - + Signed in as %1$sPeter Parker. %2$speter.parker@gmail.com. Opens settings. - + Signed in as %sBruce Wayne. Opens settings. - + Signed out. Opens dialog to sign in and turn on sync. - + Signed out. Opens options to sign in. @@ -5169,7 +5153,7 @@ To change this setting, BEGIN_LINKclear the Ping data Feed card menu is closed - + Sign in to save this page @@ -5188,11 +5172,11 @@ To change this setting, BEGIN_LINKclear the Ping data Go to Ping App Home - - Your activity in Page Insights is saved in your <link>Ping sync chain</link>. + + Go to Ping App Home - - Your activity in Page Insights is saved in your Ping sync chain. <link>Learn how to manage this</link> + + Search Go to Ping App Voice Search @@ -5350,8 +5334,8 @@ To change this setting, BEGIN_LINKclear the Ping data %1$sYouTube also has data in Ping - - You can clear the data in Ping Settings + + You can delete the data in Ping Settings Keep Data @@ -5360,7 +5344,7 @@ To change this setting, BEGIN_LINKclear the Ping data Linked sites - + Tap to copy the URL for this app @@ -5554,13 +5538,13 @@ To change this setting, BEGIN_LINKclear the Ping data See your offline files - + Manage your account Got many windows? You can manage them from here - + To manage your Ping account, tap the "Manage account" button @@ -6208,7 +6192,7 @@ To change this setting, BEGIN_LINKclear the Ping data No thanks - + Notification permission flow @@ -6290,17 +6274,18 @@ To change this setting, BEGIN_LINKclear the Ping data Continue to %1$srp.example with %2$sidp.com + - To continue, %1$sidp.com will share your name, email address, and profile picture with this site. + To continue, %1$sidp.com will share your %2$sname and email address with this site. - To continue, %1$sidp.com will share your name, email address, and profile picture with this site. See this site's <link_terms_of_service>terms of service</link_terms_of_service>. + To continue, %1$sidp.com will share your %2$sname and email address with this site. See this site's <link_terms_of_service>terms of service</link_terms_of_service>. - To continue, %1$sidp.com will share your name, email address, and profile picture with this site. See this site's <link_privacy_policy>privacy policy</link_privacy_policy>. + To continue, %1$sidp.com will share your %2$sname and email address with this site. See this site's <link_privacy_policy>privacy policy</link_privacy_policy>. - To continue, %1$sidp.com will share your name, email address, and profile picture with this site. See this site's <link_privacy_policy>privacy policy</link_privacy_policy> and <link_terms_of_service>terms of service</link_terms_of_service>. + To continue, %1$sidp.com will share your %2$sname and email address with this site. See this site's <link_privacy_policy>privacy policy</link_privacy_policy> and <link_terms_of_service>terms of service</link_terms_of_service>. @@ -6439,7 +6424,10 @@ To change this setting, BEGIN_LINKclear the Ping data Management - Your administrator can change your browser setup remotely. Activity on this device may also be managed outside of Ping. + Your administrator can make changes to your profile and browser remotely, analyze information about the browser through reporting, and perform other necessary tasks. Activity on this device may also be managed outside of Ping. + + + The profile you’re signed in to is a managed profile. Your administrator can make changes to your profile settings remotely, analyze information about the browser through reporting, and perform other necessary tasks. <LINK>Learn More</LINK> @@ -6754,7 +6742,30 @@ To change this setting, BEGIN_LINKclear the Ping data Cancel - %1$swww.cheapalcohol.com would like to ask Android for access to your identity. Ping cannot determine what privacy risks this may pose. + %1$swww.cheapalcohol.com wants to use personal info from your digital wallet. Only continue if you trust this site. Dangerous sites might trick you into revealing things like your legal name or ID number. + + + Back to safety + + + %1$swww.cheapalcohol.com has canceled the request for identity information. + + + + + Loading PDF… + + + + + {ARCHIVED_TAB_COUNT, plural, + =1 {Inactive tab (1)} + other {Inactive tabs (#)}} + + + {INACTIVE_TIME_DAYS, plural, + =1 {Not used for 1 day or more} + other {Not used for # days or more}} Tabs you haven’t used for %1$d14 days are moved here%2$sand deleted after 60 days. You can change this anytime in %3$sSettings. diff --git a/third_party/npm_react-pdf/LICENSE b/third_party/npm_react-pdf/LICENSE new file mode 100644 index 000000000000..428bf6eaa858 --- /dev/null +++ b/third_party/npm_react-pdf/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) React Training 2016-2018 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. \ No newline at end of file diff --git a/third_party/npm_react-pdf/README.chromium b/third_party/npm_react-pdf/README.chromium index 9c22cad22253..a02e9a4df5dd 100644 --- a/third_party/npm_react-pdf/README.chromium +++ b/third_party/npm_react-pdf/README.chromium @@ -1,4 +1,4 @@ -Name: react-dropzone +Name: react-pdf URL: https://github.com/wojtekmaj/react-pdf License: MIT License File: /brave/node_modules/react-pdf/license From 9e806c77b1e186c6e45ae88278830a4df6434d2a Mon Sep 17 00:00:00 2001 From: nikhil7174 Date: Mon, 4 Nov 2024 22:29:27 +0530 Subject: [PATCH 2/4] android minor changes --- .../java/res/layout/brave_shields_tooltip_layout.xml | 1 - android/java/res/layout/new_tab_page_incognito.xml | 11 +++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/android/java/res/layout/brave_shields_tooltip_layout.xml b/android/java/res/layout/brave_shields_tooltip_layout.xml index 499313e9a235..be3c7b478859 100644 --- a/android/java/res/layout/brave_shields_tooltip_layout.xml +++ b/android/java/res/layout/brave_shields_tooltip_layout.xml @@ -51,7 +51,6 @@ android:layout_marginTop="14dp" android:padding="16dp" android:drawablePadding="10dp" - app:drawableStartCompat="@drawable/ic_brave_36" android:text="@string/shield_tooltip_desc" android:textSize="14sp" android:textColor="@color/onboarding_welcome_text_color" diff --git a/android/java/res/layout/new_tab_page_incognito.xml b/android/java/res/layout/new_tab_page_incognito.xml index a38983976c29..21d3b24a425e 100644 --- a/android/java/res/layout/new_tab_page_incognito.xml +++ b/android/java/res/layout/new_tab_page_incognito.xml @@ -64,14 +64,13 @@ android:layout_height="wrap_content" android:text="@string/brave_new_tab_private_header" android:textColor="@color/brave_white" - android:layout_marginStart="14dp" - android:layout_marginBottom="64dp" - app:layout_constraintVertical_chainStyle="packed" app:layout_constraintTop_toTopOf="parent" app:layout_constraintBottom_toTopOf="@+id/tv_first_title" - app:layout_constraintStart_toEndOf="@+id/new_tab_incognito_icon" - app:layout_constraintEnd_toEndOf="@id/guideline_end" - /> + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintHorizontal_bias="0.5" + android:layout_marginBottom="24dp" + /> Date: Tue, 5 Nov 2024 05:07:58 +0530 Subject: [PATCH 3/4] brave-stats hidden --- .../chromium/chrome/browser/ntp/BraveNewTabPageLayout.java | 6 ++++-- android/java/org/chromium/chrome/browser/ntp/NtpUtil.java | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java index cd284068bb34..59ea6f340587 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java @@ -372,7 +372,8 @@ public void run() { private void setNtpRecyclerView(LinearLayoutManager linearLayoutManager) { mIsTopSitesEnabled = NtpUtil.shouldDisplayTopSites(); - mIsBraveStatsEnabled = NtpUtil.shouldDisplayBraveStats(); + // mIsBraveStatsEnabled = NtpUtil.shouldDisplayBraveStats(); + mIsBraveStatsEnabled = false; if (mNtpAdapter == null) { if (mActivity != null && !mActivity.isDestroyed() && !mActivity.isFinishing()) { @@ -883,7 +884,8 @@ private void initPreferenceObserver() { mNtpAdapter.setTopSitesEnabled(mIsTopSitesEnabled); } else if (TextUtils.equals( key, BackgroundImagesPreferences.PREF_SHOW_BRAVE_STATS)) { - mIsBraveStatsEnabled = NtpUtil.shouldDisplayBraveStats(); + // mIsBraveStatsEnabled = NtpUtil.shouldDisplayBraveStats(); + mIsBraveStatsEnabled = false; mNtpAdapter.setBraveStatsEnabled(mIsBraveStatsEnabled); } }; diff --git a/android/java/org/chromium/chrome/browser/ntp/NtpUtil.java b/android/java/org/chromium/chrome/browser/ntp/NtpUtil.java index b5dc8b77db22..305d4733f0fb 100644 --- a/android/java/org/chromium/chrome/browser/ntp/NtpUtil.java +++ b/android/java/org/chromium/chrome/browser/ntp/NtpUtil.java @@ -23,8 +23,9 @@ public static void setDisplayTopSites(boolean shouldDisplayTopSites) { } public static boolean shouldDisplayBraveStats() { - return ChromeSharedPreferences.getInstance() - .readBoolean(BackgroundImagesPreferences.PREF_SHOW_BRAVE_STATS, true); + // return ChromeSharedPreferences.getInstance() + // .readBoolean(BackgroundImagesPreferences.PREF_SHOW_BRAVE_STATS, true); + return false; } public static void setDisplayBraveStats(boolean shouldDisplayBraveStats) { From d3bcbe382839e45234f72e965bb37cc5fb7867e6 Mon Sep 17 00:00:00 2001 From: nikhil7174 Date: Sun, 10 Nov 2024 21:30:33 +0530 Subject: [PATCH 4/4] resolved commets --- .../browser/ntp/BraveNewTabPageLayout.java | 6 ++-- .../browser/ntp/IncognitoNewTabPageView.java | 30 +++++++++---------- .../chromium/chrome/browser/ntp/NtpUtil.java | 5 ++-- .../res/layout/new_tab_page_incognito.xml | 25 +++++++++------- 4 files changed, 34 insertions(+), 32 deletions(-) diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java index 59ea6f340587..cd284068bb34 100644 --- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java +++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java @@ -372,8 +372,7 @@ public void run() { private void setNtpRecyclerView(LinearLayoutManager linearLayoutManager) { mIsTopSitesEnabled = NtpUtil.shouldDisplayTopSites(); - // mIsBraveStatsEnabled = NtpUtil.shouldDisplayBraveStats(); - mIsBraveStatsEnabled = false; + mIsBraveStatsEnabled = NtpUtil.shouldDisplayBraveStats(); if (mNtpAdapter == null) { if (mActivity != null && !mActivity.isDestroyed() && !mActivity.isFinishing()) { @@ -884,8 +883,7 @@ private void initPreferenceObserver() { mNtpAdapter.setTopSitesEnabled(mIsTopSitesEnabled); } else if (TextUtils.equals( key, BackgroundImagesPreferences.PREF_SHOW_BRAVE_STATS)) { - // mIsBraveStatsEnabled = NtpUtil.shouldDisplayBraveStats(); - mIsBraveStatsEnabled = false; + mIsBraveStatsEnabled = NtpUtil.shouldDisplayBraveStats(); mNtpAdapter.setBraveStatsEnabled(mIsBraveStatsEnabled); } }; diff --git a/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java b/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java index 004a4c76f522..b6646dda371d 100644 --- a/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java +++ b/android/java/org/chromium/chrome/browser/ntp/IncognitoNewTabPageView.java @@ -85,21 +85,21 @@ protected void onFinishInflate() { // any shortcut causes the UrlBar to be focused. See ViewRootImpl.leaveTouchMode(). mScrollView.setDescendantFocusability(FOCUS_BEFORE_DESCENDANTS); - // mVpnCta = findViewById(R.id.tv_try_vpn); - // if (BraveVpnUtils.isVpnFeatureSupported(getContext()) - // && !BraveVpnNativeWorker.getInstance().isPurchasedUser()) { - // mVpnCta.setOnClickListener( - // v -> { - // if (!InternetConnection.isNetworkAvailable(getContext())) { - // Toast.makeText(getContext(), R.string.no_internet, Toast.LENGTH_SHORT) - // .show(); - // } else { - // BraveVpnUtils.openBraveVpnPlansActivity(getContext()); - // } - // }); - // } else { - // mVpnCta.setVisibility(View.GONE); - // } + mVpnCta = findViewById(R.id.tv_try_vpn); + if (BraveVpnUtils.isVpnFeatureSupported(getContext()) + && !BraveVpnNativeWorker.getInstance().isPurchasedUser() || false) { + mVpnCta.setOnClickListener( + v -> { + if (!InternetConnection.isNetworkAvailable(getContext())) { + Toast.makeText(getContext(), R.string.no_internet, Toast.LENGTH_SHORT) + .show(); + } else { + BraveVpnUtils.openBraveVpnPlansActivity(getContext()); + } + }); + } else { + mVpnCta.setVisibility(View.GONE); + } } /** diff --git a/android/java/org/chromium/chrome/browser/ntp/NtpUtil.java b/android/java/org/chromium/chrome/browser/ntp/NtpUtil.java index 305d4733f0fb..aaaeb0449f85 100644 --- a/android/java/org/chromium/chrome/browser/ntp/NtpUtil.java +++ b/android/java/org/chromium/chrome/browser/ntp/NtpUtil.java @@ -23,9 +23,8 @@ public static void setDisplayTopSites(boolean shouldDisplayTopSites) { } public static boolean shouldDisplayBraveStats() { - // return ChromeSharedPreferences.getInstance() - // .readBoolean(BackgroundImagesPreferences.PREF_SHOW_BRAVE_STATS, true); - return false; + return ChromeSharedPreferences.getInstance() + .readBoolean(BackgroundImagesPreferences.PREF_SHOW_BRAVE_STATS, false); } public static void setDisplayBraveStats(boolean shouldDisplayBraveStats) { diff --git a/android/java/res/layout/new_tab_page_incognito.xml b/android/java/res/layout/new_tab_page_incognito.xml index 21d3b24a425e..6df9236a05e4 100644 --- a/android/java/res/layout/new_tab_page_incognito.xml +++ b/android/java/res/layout/new_tab_page_incognito.xml @@ -43,7 +43,8 @@ app:layout_constraintGuide_end="32dp" /> - + /> - + /> - + /> - + /> - + />