enable_feed_v1=false

This removes Feedv1 from the build.

Bug: 1165828
Change-Id: I9178d22a1c2929870e678b39d4e8da9b84d095cf
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2624531Reviewed-by: Hao Dong <spdonghao@chromium.org>
Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Reviewed-by: Justin DeWitt <dewittj@chromium.org>
Commit-Queue: Dan H <harringtond@chromium.org>
Cr-Commit-Position: refs/heads/master@{#843255}

chrome/android/features/start_surface/internal/javatests/src/org/chromium/chrome/features/start_surface/InstantStartTest.java

@@ -82,6 +82,7 @@ import org.chromium.chrome.browser.compositor.layouts.StaticLayout;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
 import org.chromium.chrome.browser.device.DeviceClassManager;
 import org.chromium.chrome.browser.feed.FeedV1;
+import org.chromium.chrome.browser.feed.FeedV2;
 import org.chromium.chrome.browser.feed.shared.FeedFeatures;
 import org.chromium.chrome.browser.flags.CachedFeatureFlags;
 import org.chromium.chrome.browser.flags.ChromeFeatureList;
@@ -123,7 +124,7 @@ import org.chromium.ui.test.util.UiRestriction;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
-import java.util.Arrays;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.atomic.AtomicInteger;
@@ -161,13 +162,16 @@ public class InstantStartTest {
      * Parameter set controlling whether Feed v2 is enabled.
      */
     public static class FeedParams implements ParameterProvider {
-        private static List<ParameterSet> sFeedParams =
-                Arrays.asList(new ParameterSet().value(false).name("FeedV1"),
-                        new ParameterSet().value(true).name("FeedV2"));
-
         @Override
         public List<ParameterSet> getParameters() {
-            return sFeedParams;
+            List<ParameterSet> feedParams = new ArrayList<ParameterSet>();
+            if (FeedV1.IS_AVAILABLE) {
+                feedParams.add(new ParameterSet().value(false).name("FeedV1"));
+            }
+            if (FeedV2.IS_AVAILABLE) {
+                feedParams.add(new ParameterSet().value(true).name("FeedV2"));
+            }
+            return feedParams;
         }
     }
 

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/BUILD.gn

@@ -4,11 +4,14 @@
 
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
+import("//components/feed/features.gni")
 import("//third_party/protobuf/proto_library.gni")
 
-android_resources("piet_resources") {
-  sources = [
-    "piet/res/drawable-v21/piet_clickable_ripple.xml",
-    "piet/res/values/styles.xml",
-  ]
+if (enable_feed_v1) {
+  android_resources("piet_resources") {
+    sources = [
+      "piet/res/drawable-v21/piet_clickable_ripple.xml",
+      "piet/res/values/styles.xml",
+    ]
+  }
 }

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/res/drawable-v21/piet_clickable_ripple.xml

@@ -4,8 +4,10 @@ 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.
 -->
+<!-- Comment out to avoid Android lint failure.
 <ripple xmlns:android="http://schemas.android.com/apk/res/android"
     android:color="?android:attr/colorControlHighlight">
   <!-- Mask drawable, not actually rendered. This just keeps the ripple inside the module. -->
   <item android:id="@android:id/mask" android:drawable="@android:color/white"/>
 </ripple>
+-->

chrome/android/feed/core/java/src/org/chromium/chrome/browser/feed/library/piet/res/values/styles.xml

@@ -4,6 +4,7 @@ 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.
 -->
+<!-- Comment out to avoid Android lint failure.
 <resources xmlns:android="http://schemas.android.com/apk/res/android">
   <style name="gm_font_weight_regular">
     <item name="android:fontFamily">sans-serif</item>
@@ -20,3 +21,4 @@ found in the LICENSE file.
     <item name="android:textAlignment">viewStart</item>
   </style>
 </resources>
+-->

components/feed/features.gni

@@ -11,7 +11,8 @@ import("//chrome/android/channel.gni")
 # the NTP.
 declare_args() {
   # Whether version 1 of the NTP feed is enabled in the build.
-  enable_feed_v1 = is_android
+  # TODO(crbug.com/1165828): Remove feed v1 code when we're ready.
+  enable_feed_v1 = false
 
   # Whether version 2 of the NTP feed is enabled in the build.
   enable_feed_v2 = is_android