From 56193fe255db39b94de29836cb89e4688778c373 Mon Sep 17 00:00:00 2001
From: samartnik <artem@brave.com>
Date: Tue, 30 Nov 2021 18:23:20 -0500
Subject: [PATCH] [Android] Adjustments to UI changes in the upstream

Chromium change:
https://chromium-review.googlesource.com/c/chromium/src/+/3283625

Clean up legacy non-ThemeRefactorAndroid code now that the feature has
launched.

Bug: 1251194
---
 .../browser/tasks/tab_management/BraveTabUiThemeProvider.java | 4 ++--
 .../chromium/chrome/browser/ntp/BraveNewTabPageLayout.java    | 4 ++--
 android/java/res/layout/menu_separator.xml                    | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabUiThemeProvider.java b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabUiThemeProvider.java
index ea8821a2dd3..7c35287577b 100644
--- a/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabUiThemeProvider.java
+++ b/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/BraveTabUiThemeProvider.java
@@ -17,7 +17,7 @@ import org.chromium.chrome.tab_ui.R;
 public class BraveTabUiThemeProvider {
     @ColorInt
     public static int getTitleTextColor(Context context, boolean isIncognito, boolean isSelected) {
-        if (TabUiThemeProvider.themeRefactorEnabled() && isSelected) {
+        if (isSelected) {
             return ApiCompatibilityUtils.getColor(
                     context.getResources(), R.color.baseline_neutral_900);
         }
@@ -27,7 +27,7 @@ public class BraveTabUiThemeProvider {
 
     public static ColorStateList getActionButtonTintList(
             Context context, boolean isIncognito, boolean isSelected) {
-        if (TabUiThemeProvider.themeRefactorEnabled() && isSelected) {
+        if (isSelected) {
             return AppCompatResources.getColorStateList(context, R.color.baseline_neutral_900);
         }
 
diff --git a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
index 00ae309b2f4..61eadad8c23 100644
--- a/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
+++ b/android/java/org/chromium/chrome/browser/ntp/BraveNewTabPageLayout.java
@@ -1354,8 +1354,8 @@ public class BraveNewTabPageLayout
                     GlobalNightModeStateProviderHolder.getInstance().isInNightMode()
                     ? android.R.color.white
                     : android.R.color.black;
-            ImageViewCompat.setImageTintList(
-                    mSuperReferralLogo, ColorStateList.valueOf(floatingButtonIconColor));
+            ImageViewCompat.setImageTintList(mSuperReferralLogo,
+                    ColorStateList.valueOf(getResources().getColor(floatingButtonIconColor)));
             mSuperReferralLogo.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
diff --git a/android/java/res/layout/menu_separator.xml b/android/java/res/layout/menu_separator.xml
index a21e73dc727..482eb7495cf 100644
--- a/android/java/res/layout/menu_separator.xml
+++ b/android/java/res/layout/menu_separator.xml
@@ -7,7 +7,7 @@
 
         <ImageView
             android:id="@+id/brave_shields_shadow"
-            android:src="@drawable/toolbar_shadow_normal"
+            android:src="@drawable/modern_toolbar_shadow"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:scaleType="fitXY"