Merge pull request #86 from ping-browser/nikhil/chrome-130

android chromium-130 changes
ping-browser · Nov 10, 2024 · 5c7c61e · 5c7c61e
2 parents dc28efa + d3bcbe3
commit 5c7c61e
Show file tree

Hide file tree

Showing 9 changed files with 265 additions and 274 deletions.
diff --git 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
@@ -87,7 +87,7 @@ protected void onFinishInflate() {
 
         mVpnCta = findViewById(R.id.tv_try_vpn);
         if (BraveVpnUtils.isVpnFeatureSupported(getContext())
-                && !BraveVpnNativeWorker.getInstance().isPurchasedUser()) {
+                && !BraveVpnNativeWorker.getInstance().isPurchasedUser() || false) {
             mVpnCta.setOnClickListener(
                     v -> {
                         if (!InternetConnection.isNetworkAvailable(getContext())) {

diff --git a/android/java/org/chromium/chrome/browser/ntp/NtpUtil.java b/android/java/org/chromium/chrome/browser/ntp/NtpUtil.java
@@ -24,7 +24,7 @@ public static void setDisplayTopSites(boolean shouldDisplayTopSites) {
 
     public static boolean shouldDisplayBraveStats() {
         return ChromeSharedPreferences.getInstance()
-                .readBoolean(BackgroundImagesPreferences.PREF_SHOW_BRAVE_STATS, true);
+                .readBoolean(BackgroundImagesPreferences.PREF_SHOW_BRAVE_STATS, false);
     }
 
     public static void setDisplayBraveStats(boolean shouldDisplayBraveStats) {

diff --git 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
@@ -44,6 +44,7 @@
 
             <!-- Keep the ID below as it's been tested in Chromium code by IncognitoNewTabPageStation. -->
             <ImageView
+                android:visibility="gone"
                 android:id="@+id/new_tab_incognito_icon"
                 android:layout_width="@dimen/new_tab_page_incognito_logo_size"
                 android:layout_height="@dimen/new_tab_page_incognito_logo_size"
@@ -64,14 +65,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"
+            />
 
             <ImageView
                 android:id="@+id/iv_first_icon"
@@ -161,6 +161,7 @@
                 />
 
             <ImageView
+                android:visibility="invisible"
                 android:id="@+id/iv_third_icon"
                 app:layout_constraintHorizontal_chainStyle="packed"
                 android:layout_width="@dimen/new_tab_page_incognito_icon_size"
@@ -174,6 +175,7 @@
                 />
 
             <TextView
+                android:visibility="invisible"
                 android:id="@+id/tv_third_title"
                 style="@style/DefaultSemibold"
                 app:layout_constraintWidth_max="460dp"
@@ -189,6 +191,7 @@
                 />
 
             <TextView
+                android:visibility="invisible"
                 android:id="@+id/tv_third_description"
                 style="@style/DefaultRegular"
                 android:layout_width="0dp"
@@ -203,6 +206,7 @@
                 />
 
             <TextView
+                android:visibility="invisible"
                 android:id="@+id/tv_try_vpn"
                 style="@style/DefaultSemibold"
                 android:layout_width="0dp"

diff --git a/browser/ui/android/strings/android_brave_strings.grd b/browser/ui/android/strings/android_brave_strings.grd
diff --git a/browser/ui/android/strings/android_chrome_strings.grd b/browser/ui/android/strings/android_chrome_strings.grd
diff --git a/third_party/npm_react-pdf/LICENSE 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.
diff --git 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