From b09d7ac360c8c53a1a9e6b52c7cf690a7579f66f Mon Sep 17 00:00:00 2001 From: Artem Samoilenko Date: Thu, 29 Jun 2023 15:24:01 -0400 Subject: [PATCH] [Android] Disable Baseline Surface Colors These colors mess up with Brave theme, so we disable them for now. Chromium change: https://github.com/chromium/chromium/commit/994591b18af84bbbc21d8549d6f3dc97b767c3a5 [BaselineSurfaceColors] Enable Baseline Surface Colors change by default Enable Baseline Surface Colors change by default. See 100% stable approval at http://launch/4218139. Will enable by default on ToT to provide max_version for finch experiment. Will cleanup flag checks, etc. separately. Bug: 1451864 --- .../src/org/chromium/chrome/browser/flags/BraveCachedFlag.java | 1 + chromium_src/chrome/browser/flags/android/chrome_feature_list.cc | 1 + 2 files changed, 2 insertions(+) diff --git a/browser/flags/android/java/src/org/chromium/chrome/browser/flags/BraveCachedFlag.java b/browser/flags/android/java/src/org/chromium/chrome/browser/flags/BraveCachedFlag.java index a762d52f294..598cb3e45d9 100644 --- a/browser/flags/android/java/src/org/chromium/chrome/browser/flags/BraveCachedFlag.java +++ b/browser/flags/android/java/src/org/chromium/chrome/browser/flags/BraveCachedFlag.java @@ -15,6 +15,7 @@ public class BraveCachedFlag extends CachedFlag { private static final HashMap sFlags; static { sFlags = new HashMap(); + sFlags.put(ChromeFeatureList.BASELINE_GM3_SURFACE_COLORS, false); sFlags.put(ChromeFeatureList.START_SURFACE_ANDROID, false); // Disable until we sort out UI issues // https://github.com/brave/brave-browser/issues/29688 diff --git a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc index e69dac2f5ef..1077c2aea96 100644 --- a/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc +++ b/chromium_src/chrome/browser/flags/android/chrome_feature_list.cc @@ -48,6 +48,7 @@ namespace android { OVERRIDE_FEATURE_DEFAULT_STATES({{ {kAddToHomescreenIPH, base::FEATURE_DISABLED_BY_DEFAULT}, + {kBaselineGM3SurfaceColors, base::FEATURE_DISABLED_BY_DEFAULT}, // Disable until we sort out UI issues // https://github.com/brave/brave-browser/issues/29688 {kIncognitoReauthenticationForAndroid, base::FEATURE_DISABLED_BY_DEFAULT},