[Android] Remove dark mode build flag

Remove the dark mode build flag and merge res_night/ into normal res/
directory. Also removes the dark mode flag from about://flags.

BUG=936275

Change-Id: Icd8df11f94ef9ab6314c4a2fcd47ecab261985a9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2031877
Commit-Queue: Theresa  <twellington@chromium.org>
Reviewed-by: Elly Fong-Jones <ellyjones@chromium.org>
Reviewed-by: Peter Wen <wnwen@chromium.org>
Reviewed-by: Sinan Sahin <sinansahin@google.com>
Cr-Commit-Position: refs/heads/master@{#739206}

chrome/android/BUILD.gn

@@ -28,7 +28,6 @@ import("//third_party/icu/config.gni")
 import("//third_party/protobuf/proto_library.gni")
 import("//tools/resources/generate_resource_whitelist.gni")
 import("//tools/v8_context_snapshot/v8_context_snapshot.gni")
-import("//ui/android/features.gni")
 import("//weblayer/variables.gni")
 import("channel.gni")
 import("java_sources.gni")
@@ -141,10 +140,6 @@ android_resources("chrome_app_java_resources") {
     "//chrome/android/java/res_chromium",
   ]
 
-  if (enable_android_night_mode) {
-    resource_dirs += [ "//chrome/android/java/res_night" ]
-  }
-
   deps = [
     ":ui_locale_string_resources",
     "//chrome/android/webapk/libs/common:splash_resources",

chrome/android/java/res_night/values-night/colors.xml → chrome/android/java/res/values-night/colors.xml

@@ -10,7 +10,7 @@
     <color name="bottom_system_nav_divider_color">@android:color/black</color>
 
     <!-- Account Signin Colors -->
-    <color name="signin_header_animation_background">#28282B</color>
+    <color name="signin_header_animation_background">@color/signin_header_animation_bg_dark</color>
     <color name="signin_header_animation_line_light">@color/modern_grey_700</color>
     <color name="signin_header_animation_line_dark">@color/modern_grey_700</color>
     <color name="signin_header_animation_laptop_screen">@color/modern_grey_900</color>

chrome/android/java/res_night/OWNERS

-# This restriction is in place to avoid accidental addition to our top level
-# layout files, such as adding duplicated assets, or introducing new colors when
-# we don't want them.
-set noparent
-
-file://ui/android/java/res/LAYOUT_OWNERS
-
-# COMPONENT: UI>Browser>Mobile
-# OS: Android

chrome/browser/about_flags.cc

@@ -177,7 +177,6 @@
 #if defined(OS_ANDROID)
 #include "chrome/browser/android/explore_sites/explore_sites_feature.h"
 #include "chrome/browser/flags/android/chrome_feature_list.h"
-#include "ui/android/buildflags.h"
 #else  // OS_ANDROID
 #include "chrome/browser/media/router/media_router_feature.h"
 #include "components/mirroring/service/features.h"
@@ -1327,11 +1326,6 @@ const FeatureEntry::Choice kNotificationSchedulerChoices[] = {
 };
 
 #if defined(OS_ANDROID)
-const FeatureEntry::FeatureParam kAndroidNightModeDefaultToLightConstant[] = {
-    {"default_light_theme", "true"}};
-const FeatureEntry::FeatureVariation kAndroidNightModeFeatureVariations[] = {
-    {"(default to light theme)", kAndroidNightModeDefaultToLightConstant,
-     base::size(kAndroidNightModeDefaultToLightConstant), nullptr}};
 
 const FeatureEntry::FeatureParam kOmniboxAssistantVoiceSearchGreyMic[] = {
     {"min_agsa_version", "10.95"},
@@ -2546,17 +2540,10 @@ const FeatureEntry kFeatureEntries[] = {
                                     "ForceDarkVariations")},
 #endif  // !OS_CHROMEOS
 #if defined(OS_ANDROID)
-#if BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
-    {"enable-android-night-mode", flag_descriptions::kAndroidNightModeName,
-     flag_descriptions::kAndroidNightModeDescription, kOsAndroid,
-     FEATURE_WITH_PARAMS_VALUE_TYPE(chrome::android::kAndroidNightMode,
-                                    kAndroidNightModeFeatureVariations,
-                                    "AndroidNightMode")},
     {"enable-android-night-mode-tab-reparenting",
      flag_descriptions::kAndroidNightModeTabReparentingName,
      flag_descriptions::kAndroidNightModeTabReparentingDescription, kOsAndroid,
      FEATURE_VALUE_TYPE(chrome::android::kAndroidNightModeTabReparenting)},
-#endif  // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
 #endif  // OS_ANDROID
     {"enable-experimental-accessibility-language-detection",
      flag_descriptions::kExperimentalAccessibilityLanguageDetectionName,

chrome/browser/flag_descriptions.cc

@@ -2690,20 +2690,11 @@ const char kInlineUpdateFlowDescription[] =
     "flow where they do not have to leave Chrome until the update is ready "
     "to install.";
 
-#if BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
-
-const char kAndroidNightModeName[] = "Android Chrome UI dark mode";
-const char kAndroidNightModeDescription[] =
-    "If enabled, user can enable Android Chrome UI dark mode through settings.";
-
 const char kAndroidNightModeTabReparentingName[] =
     "Android Chrome UI dark mode tab reparenting";
 const char kAndroidNightModeTabReparentingDescription[] =
     "If enabled, when the user changes themes the current tabs are reparented "
     "instead of reloaded.";
-
-#endif  // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
-
 // Non-Android -----------------------------------------------------------------
 
 #else  // !defined(OS_ANDROID)

chrome/browser/flag_descriptions.h

@@ -17,10 +17,6 @@
 #include "media/media_buildflags.h"
 #include "ppapi/buildflags/buildflags.h"
 
-#if defined(OS_ANDROID)
-#include "ui/android/buildflags.h"
-#endif  // defined(OS_ANDROID)
-
 #if defined(OS_LINUX)
 #include "base/allocator/buildflags.h"
 #endif  // defined(OS_LINUX)
@@ -1548,16 +1544,9 @@ extern const char kUsageStatsName[];
 extern const char kInlineUpdateFlowName[];
 extern const char kInlineUpdateFlowDescription[];
 
-#if BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
-
-extern const char kAndroidNightModeName[];
-extern const char kAndroidNightModeDescription[];
-
 extern const char kAndroidNightModeTabReparentingName[];
 extern const char kAndroidNightModeTabReparentingDescription[];
 
-#endif  // BUILDFLAG(ENABLE_ANDROID_NIGHT_MODE)
-
 // Non-Android ----------------------------------------------------------------
 
 #else  // !defined(OS_ANDROID)

components/browser_ui/modaldialog/android/BUILD.gn

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
-import("//ui/android/features.gni")
 
 android_library("java") {
   sources = [

components/browser_ui/styles/android/BUILD.gn

@@ -3,7 +3,6 @@
 # found in the LICENSE file.
 
 import("//build/config/android/rules.gni")
-import("//ui/android/features.gni")
 
 android_library("java") {
   sources =
@@ -26,8 +25,4 @@ android_resources("java_resources") {
     "//third_party/android_deps:com_android_support_design_java",
     "//ui/android:ui_java_resources",
   ]
-
-  if (enable_android_night_mode) {
-    resource_dirs += [ "java/res_night" ]
-  }
 }

components/find_in_page/android/BUILD.gn

@@ -4,7 +4,6 @@
 
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
-import("//ui/android/features.gni")
 
 android_library("java") {
   sources = [

components/find_in_page/android/OWNERS

+file://chrome/android/OWNERS
+
+# COMPONENT: UI>Browser>FindInPage

components/javascript_dialogs/android/BUILD.gn

@@ -4,7 +4,6 @@
 
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
-import("//ui/android/features.gni")
 
 android_library("java") {
   sources = [

docs/ui/android/night_mode.md

@@ -26,7 +26,7 @@ In [//src/ui/android/java/res/values/colors.xml](https://cs.chromium.org/chromiu
 <color name="new_bg_color">@color/new_bg_color_light</color>
 ```
 
-In [//src/ui/android/java/res_night/values-night/colors.xml](https://cs.chromium.org/chromium/src/ui/android/java/res_night/values-night/colors.xml), add
+In [//src/ui/android/java/res/values-night/colors.xml](https://cs.chromium.org/chromium/src/ui/android/java/res/values-night/colors.xml), add
 ```xml
 <color name="new_bg_color">@color/new_bg_color_dark</color>
 ```

ui/android/BUILD.gn

@@ -2,20 +2,12 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build/buildflag_header.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//testing/test.gni")
-import("//ui/android/features.gni")
 
 assert(is_android)
 
-# Generate a buildflag header for compile-time checking of android night mode support.
-buildflag_header("buildflags") {
-  header = "buildflags.h"
-  flags = [ "ENABLE_ANDROID_NIGHT_MODE=$enable_android_night_mode" ]
-}
-
 component("android") {
   output_name = "ui_android"
   sources = [
@@ -63,7 +55,6 @@ component("android") {
   defines = [ "UI_ANDROID_IMPLEMENTATION" ]
 
   deps = [
-    ":buildflags",
     ":java_enums_srcjar",
     ":ui_android_jni_headers",
     "//base",
@@ -190,10 +181,6 @@ android_resources("ui_java_resources") {
   custom_package = "org.chromium.ui"
   resource_dirs = [ "java/res" ]
 
-  if (enable_android_night_mode) {
-    resource_dirs += [ "//ui/android/java/res_night" ]
-  }
-
   deps = [ ":ui_strings_grd" ]
 }
 

ui/android/features.gni

-# Copyright 2019 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-declare_args() {
-  enable_android_night_mode = is_android
-}

ui/android/java/res/values/color_palette.xml

@@ -62,6 +62,7 @@
     <color name="google_blue_50" tools:ignore="UnusedResources">#E3F2FD</color>
 
     <!-- Warning: One off below, do not use for other purpose. -->
+    <color name="signin_header_animation_bg_dark" tools:ignore="UnusedResources">#28282B</color>
     <!-- TODO(https://crbug.com/1020436): Update the highlight colors to meet accessibility
         contrast ratio. -->
     <color name="highlight_color_on_light_text" tools:ignore="UnusedResources">#CC5595FE</color>