From 73158b175414f515afc2e0057e8d99807e9be942 Mon Sep 17 00:00:00 2001
From: Ho Cheung <uioptt24@gmail.com>
Date: Mon, 4 Sep 2023 20:06:30 +0800
Subject: [PATCH 1/3] Update NTP patch

---
 ...tch => Remove-discovery-module-from-NTP.patch} | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)
 rename other/{Android-Remove-discovery-module-from-NTP.patch => Remove-discovery-module-from-NTP.patch} (88%)

diff --git a/other/Android-Remove-discovery-module-from-NTP.patch b/other/Remove-discovery-module-from-NTP.patch
similarity index 88%
rename from other/Android-Remove-discovery-module-from-NTP.patch
rename to other/Remove-discovery-module-from-NTP.patch
index 6d9c412a..8a10139f 100644
--- a/other/Android-Remove-discovery-module-from-NTP.patch
+++ b/other/Remove-discovery-module-from-NTP.patch
@@ -1,9 +1,8 @@
-From 9d07f991a3996c0219320b77b6611e80053db0e3 Mon Sep 17 00:00:00 2001
+From 953b1d8165d73d341c30300f160e108a9ab4df40 Mon Sep 17 00:00:00 2001
 From: Ho Cheung <uioptt24@gmail.com>
-Date: Wed, 28 Jun 2023 02:52:35 +0800
+Date: Sun, 3 Sep 2023 11:39:19 +0800
 Subject: [PATCH] [Android] Remove discovery module from NTP
 
-Change-Id: Ied94517abba26e45e18b5a98ca5851a2c37b1c42
 ---
  .../res/layout/new_tab_page_feed_v2_expandable_header.xml    | 5 +++--
  .../java/res/layout/new_tab_page_multi_feed_header.xml       | 5 +++--
@@ -33,7 +32,7 @@ index ee1283cb9a6a0..e15ddc9532cce 100644
      <RelativeLayout
          tools:ignore="RelativeOverlap"
 diff --git a/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml b/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml
-index 9c7aa0fb74cb1..df79f5c27f07e 100644
+index 483e954de0a49..102ba230e2134 100644
 --- a/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml
 +++ b/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml
 @@ -1,6 +1,6 @@
@@ -55,7 +54,7 @@ index 9c7aa0fb74cb1..df79f5c27f07e 100644
    <LinearLayout
        android:id="@+id/main_content"
 diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/core/shared_prefs/pref_names.cc
-index e239b42b31ef3..21c7aab6bedd0 100644
+index 71586a65fcd92..26e9cfbe72c80 100644
 --- a/components/feed/core/shared_prefs/pref_names.cc
 +++ b/components/feed/core/shared_prefs/pref_names.cc
 @@ -1,4 +1,4 @@
@@ -64,15 +63,15 @@ index e239b42b31ef3..21c7aab6bedd0 100644
  // Use of this source code is governed by a BSD-style license that can be
  // found in the LICENSE file.
  
-@@ -21,7 +21,7 @@ const char kVideoPreviewsType[] = "ntp_snippets.video_previews_type";
+@@ -20,7 +20,7 @@ const char kArticlesListVisible[] = "ntp_snippets.list_visible";
  
  void RegisterFeedSharedProfilePrefs(PrefRegistrySimple* registry) {
    registry->RegisterBooleanPref(kEnableSnippets, true);
 -  registry->RegisterBooleanPref(kArticlesListVisible, true);
 +  registry->RegisterBooleanPref(kArticlesListVisible, false);
-   registry->RegisterIntegerPref(kVideoPreviewsType, 1);
  }
  
+ }  // namespace prefs
 -- 
-2.39.1.windows.1
+2.42.0.windows.1
 

From 00c2fb3c0fac751b84e3156fb328fcb5346be673 Mon Sep 17 00:00:00 2001
From: Ho Cheung <uioptt24@gmail.com>
Date: Mon, 4 Sep 2023 20:58:42 +0800
Subject: [PATCH 2/3] update NTP patch again

---
 other/Remove-discovery-module-from-NTP.patch | 40 +++++---------------
 1 file changed, 9 insertions(+), 31 deletions(-)

diff --git a/other/Remove-discovery-module-from-NTP.patch b/other/Remove-discovery-module-from-NTP.patch
index 8a10139f..d315a2c6 100644
--- a/other/Remove-discovery-module-from-NTP.patch
+++ b/other/Remove-discovery-module-from-NTP.patch
@@ -1,26 +1,18 @@
-From 953b1d8165d73d341c30300f160e108a9ab4df40 Mon Sep 17 00:00:00 2001
+From 7b72001f9bd47cb1190617a72ee35017b923ada4 Mon Sep 17 00:00:00 2001
 From: Ho Cheung <uioptt24@gmail.com>
-Date: Sun, 3 Sep 2023 11:39:19 +0800
+Date: Mon, 4 Sep 2023 20:56:29 +0800
 Subject: [PATCH] [Android] Remove discovery module from NTP
 
 ---
- .../res/layout/new_tab_page_feed_v2_expandable_header.xml    | 5 +++--
- .../java/res/layout/new_tab_page_multi_feed_header.xml       | 5 +++--
- components/feed/core/shared_prefs/pref_names.cc              | 4 ++--
- 3 files changed, 8 insertions(+), 6 deletions(-)
+ .../java/res/layout/new_tab_page_feed_v2_expandable_header.xml | 3 ++-
+ .../android/java/res/layout/new_tab_page_multi_feed_header.xml | 3 ++-
+ components/feed/core/shared_prefs/pref_names.cc                | 2 +-
+ 3 files changed, 5 insertions(+), 3 deletions(-)
 
 diff --git a/chrome/browser/feed/android/java/res/layout/new_tab_page_feed_v2_expandable_header.xml b/chrome/browser/feed/android/java/res/layout/new_tab_page_feed_v2_expandable_header.xml
-index ee1283cb9a6a0..e15ddc9532cce 100644
+index ee1283cb9a6a0..01cf8d4ef4e7e 100644
 --- a/chrome/browser/feed/android/java/res/layout/new_tab_page_feed_v2_expandable_header.xml
 +++ b/chrome/browser/feed/android/java/res/layout/new_tab_page_feed_v2_expandable_header.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <!--
--Copyright 2020 The Chromium Authors
-+Copyright 2020 The Chromium Authors, Alex313031 and gz83
- Use of this source code is governed by a BSD-style license that can be
- found in the LICENSE file.
- -->
 @@ -14,7 +14,8 @@ found in the LICENSE file.
      android:minHeight="@dimen/snippets_article_header_height"
      android:orientation="vertical"
@@ -32,17 +24,9 @@ index ee1283cb9a6a0..e15ddc9532cce 100644
      <RelativeLayout
          tools:ignore="RelativeOverlap"
 diff --git a/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml b/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml
-index 483e954de0a49..102ba230e2134 100644
+index 483e954de0a49..8a68a7b230cbf 100644
 --- a/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml
 +++ b/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml
-@@ -1,6 +1,6 @@
- <?xml version="1.0" encoding="utf-8"?>
- <!--
--Copyright 2021 The Chromium Authors
-+Copyright 2021 The Chromium Authors, Alex313031 and gz83
- Use of this source code is governed by a BSD-style license that can be
- found in the LICENSE file.
- -->
 @@ -11,7 +11,8 @@ found in the LICENSE file.
      xmlns:tools="http://schemas.android.com/tools"
      android:layout_width="match_parent"
@@ -54,15 +38,9 @@ index 483e954de0a49..102ba230e2134 100644
    <LinearLayout
        android:id="@+id/main_content"
 diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/core/shared_prefs/pref_names.cc
-index 71586a65fcd92..26e9cfbe72c80 100644
+index 71586a65fcd92..3455a46cb886e 100644
 --- a/components/feed/core/shared_prefs/pref_names.cc
 +++ b/components/feed/core/shared_prefs/pref_names.cc
-@@ -1,4 +1,4 @@
--// Copyright 2020 The Chromium Authors
-+// Copyright 2020 The Chromium Authors, Alex313031 and gz83
- // Use of this source code is governed by a BSD-style license that can be
- // found in the LICENSE file.
- 
 @@ -20,7 +20,7 @@ const char kArticlesListVisible[] = "ntp_snippets.list_visible";
  
  void RegisterFeedSharedProfilePrefs(PrefRegistrySimple* registry) {

From c9938eae7d984b241695d452936edb2f8f06782c Mon Sep 17 00:00:00 2001
From: Ho Cheung <uioptt24@gmail.com>
Date: Mon, 4 Sep 2023 21:15:35 +0800
Subject: [PATCH 3/3] Update copyright

---
 other/Remove-discovery-module-from-NTP.patch | 38 +++++++++++++++-----
 1 file changed, 30 insertions(+), 8 deletions(-)

diff --git a/other/Remove-discovery-module-from-NTP.patch b/other/Remove-discovery-module-from-NTP.patch
index d315a2c6..67448485 100644
--- a/other/Remove-discovery-module-from-NTP.patch
+++ b/other/Remove-discovery-module-from-NTP.patch
@@ -1,18 +1,26 @@
-From 7b72001f9bd47cb1190617a72ee35017b923ada4 Mon Sep 17 00:00:00 2001
+From 9b56230adb566db99b9b6bab8fa4183cf66f213b Mon Sep 17 00:00:00 2001
 From: Ho Cheung <uioptt24@gmail.com>
 Date: Mon, 4 Sep 2023 20:56:29 +0800
 Subject: [PATCH] [Android] Remove discovery module from NTP
 
 ---
- .../java/res/layout/new_tab_page_feed_v2_expandable_header.xml | 3 ++-
- .../android/java/res/layout/new_tab_page_multi_feed_header.xml | 3 ++-
- components/feed/core/shared_prefs/pref_names.cc                | 2 +-
- 3 files changed, 5 insertions(+), 3 deletions(-)
+ .../res/layout/new_tab_page_feed_v2_expandable_header.xml    | 5 +++--
+ .../java/res/layout/new_tab_page_multi_feed_header.xml       | 5 +++--
+ components/feed/core/shared_prefs/pref_names.cc              | 4 ++--
+ 3 files changed, 8 insertions(+), 6 deletions(-)
 
 diff --git a/chrome/browser/feed/android/java/res/layout/new_tab_page_feed_v2_expandable_header.xml b/chrome/browser/feed/android/java/res/layout/new_tab_page_feed_v2_expandable_header.xml
-index ee1283cb9a6a0..01cf8d4ef4e7e 100644
+index ee1283cb9a6a0..c89b236330bf9 100644
 --- a/chrome/browser/feed/android/java/res/layout/new_tab_page_feed_v2_expandable_header.xml
 +++ b/chrome/browser/feed/android/java/res/layout/new_tab_page_feed_v2_expandable_header.xml
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!--
+-Copyright 2020 The Chromium Authors
++Copyright 2023 The Chromium Authors, Alex313031 and gz83
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file.
+ -->
 @@ -14,7 +14,8 @@ found in the LICENSE file.
      android:minHeight="@dimen/snippets_article_header_height"
      android:orientation="vertical"
@@ -24,9 +32,17 @@ index ee1283cb9a6a0..01cf8d4ef4e7e 100644
      <RelativeLayout
          tools:ignore="RelativeOverlap"
 diff --git a/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml b/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml
-index 483e954de0a49..8a68a7b230cbf 100644
+index 483e954de0a49..15ca071b1d30f 100644
 --- a/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml
 +++ b/chrome/browser/feed/android/java/res/layout/new_tab_page_multi_feed_header.xml
+@@ -1,6 +1,6 @@
+ <?xml version="1.0" encoding="utf-8"?>
+ <!--
+-Copyright 2021 The Chromium Authors
++Copyright 2023 The Chromium Authors, Alex313031 and gz83
+ Use of this source code is governed by a BSD-style license that can be
+ found in the LICENSE file.
+ -->
 @@ -11,7 +11,8 @@ found in the LICENSE file.
      xmlns:tools="http://schemas.android.com/tools"
      android:layout_width="match_parent"
@@ -38,9 +54,15 @@ index 483e954de0a49..8a68a7b230cbf 100644
    <LinearLayout
        android:id="@+id/main_content"
 diff --git a/components/feed/core/shared_prefs/pref_names.cc b/components/feed/core/shared_prefs/pref_names.cc
-index 71586a65fcd92..3455a46cb886e 100644
+index 71586a65fcd92..e3397204d2b8b 100644
 --- a/components/feed/core/shared_prefs/pref_names.cc
 +++ b/components/feed/core/shared_prefs/pref_names.cc
+@@ -1,4 +1,4 @@
+-// Copyright 2020 The Chromium Authors
++// Copyright 2023 The Chromium Authors, Alex313031 and gz83
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
 @@ -20,7 +20,7 @@ const char kArticlesListVisible[] = "ntp_snippets.list_visible";
  
  void RegisterFeedSharedProfilePrefs(PrefRegistrySimple* registry) {