Merge pull request #211 from gz83/main

Update NTP patch
This commit is contained in:
Alexander David Frick 2023-09-04 13:07:50 -05:00 committed by GitHub
commit b45c93891b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 12 deletions

View File

@ -1,9 +1,8 @@
From 9d07f991a3996c0219320b77b6611e80053db0e3 Mon Sep 17 00:00:00 2001
From 9b56230adb566db99b9b6bab8fa4183cf66f213b Mon Sep 17 00:00:00 2001
From: Ho Cheung <uioptt24@gmail.com>
Date: Wed, 28 Jun 2023 02:52:35 +0800
Date: Mon, 4 Sep 2023 20:56:29 +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 +++--
@ -11,14 +10,14 @@ Change-Id: Ied94517abba26e45e18b5a98ca5851a2c37b1c42
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..e15ddc9532cce 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 2020 The Chromium Authors, Alex313031 and gz83
+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.
-->
@ -33,14 +32,14 @@ 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..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 2021 The Chromium Authors, Alex313031 and gz83
+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.
-->
@ -55,24 +54,24 @@ 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..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 2020 The Chromium Authors, Alex313031 and gz83
+// 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.
@@ -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