Remove shorts for youtube (uplift to 1.66.x) (#23302)

Uplift of #23130 (squashed) to beta

Author: brave-builds

android/java/org/chromium/chrome/browser/settings/MediaPreferences.java

@@ -35,6 +35,7 @@ public class MediaPreferences extends BravePreferenceFragment
             "hide_youtube_recommended_content";
     private static final String PREF_HIDE_YOUTUBE_DISTRACTING_ELEMENTS =
             "hide_youtube_distracting_elements";
+    private static final String PREF_HIDE_YOUTUBE_SHORTS = "hide_youtube_shorts";
 
     private FilterListAndroidHandler mFilterListAndroidHandler;
 
@@ -91,6 +92,11 @@ public void onActivityCreated(Bundle savedInstanceState) {
         if (hideYoutubeDistractingElementsPref != null) {
             hideYoutubeDistractingElementsPref.setOnPreferenceChangeListener(this);
         }
+        ChromeSwitchPreference hideYoutubeShortsPref =
+                (ChromeSwitchPreference) findPreference(PREF_HIDE_YOUTUBE_SHORTS);
+        if (hideYoutubeShortsPref != null) {
+            hideYoutubeShortsPref.setOnPreferenceChangeListener(this);
+        }
 
         if (mFilterListAndroidHandler != null) {
             mFilterListAndroidHandler.isFilterListEnabled(
@@ -107,6 +113,13 @@ public void onActivityCreated(Bundle savedInstanceState) {
                             hideYoutubeDistractingElementsPref.setChecked(isEnabled);
                         }
                     });
+            mFilterListAndroidHandler.isFilterListEnabled(
+                    FilterListConstants.HIDE_YOUTUBE_SHORTS_UUID,
+                    isEnabled -> {
+                        if (hideYoutubeShortsPref != null) {
+                            hideYoutubeShortsPref.setChecked(isEnabled);
+                        }
+                    });
         }
     }
 
@@ -139,6 +152,11 @@ public boolean onPreferenceChange(Preference preference, Object newValue) {
                         FilterListConstants.HIDE_YOUTUBE_DISTRACTING_ELEMENTS_UUID,
                         (boolean) newValue);
             }
+        } else if (PREF_HIDE_YOUTUBE_SHORTS.equals(key)) {
+            if (mFilterListAndroidHandler != null) {
+                mFilterListAndroidHandler.enableFilter(
+                        FilterListConstants.HIDE_YOUTUBE_SHORTS_UUID, (boolean) newValue);
+            }
         }
 
         if (shouldRelaunch) {

android/java/res/xml/media_preferences.xml

@@ -36,6 +36,11 @@
             android:title="@string/block_youtube_distracting_elements"
             android:summary="@string/block_youtube_distracting_elements_description"
             android:defaultValue="true" />
+        <org.chromium.components.browser_ui.settings.ChromeSwitchPreference
+            android:key="hide_youtube_shorts"
+            android:title="@string/block_youtube_shorts"
+            android:summary="@string/block_youtube_shorts_description"
+            android:defaultValue="false" />
     </PreferenceCategory>
 
 </PreferenceScreen>

browser/ui/android/strings/android_brave_strings.grd

@@ -440,6 +440,12 @@ This file contains all "about" strings.  It is set to NOT be translated, in tran
       <message name="IDS_BLOCK_YOUTUBE_DISTRACTING_ELEMENTS_DESCRIPTION" desc="Hides the sign in, menu, comments and video info elements on YouTube.">
         Blocks the sign in, menu, comments, and video info elements on youtube.com.
       </message>
+      <message name="IDS_BLOCK_YOUTUBE_SHORTS" desc="Hide YouTube shorts">
+        Block YouTube Shorts
+      </message>
+      <message name="IDS_BLOCK_YOUTUBE_SHORTS_DESCRIPTION" desc="Hides shorts on YouTube.">
+        Blocks Shorts from the home page, trending page and search results on youtube.com.
+      </message>
       <message name="IDS_BRAVE_SHIELDS_SOCIAL_BLOCKING_TITLE" desc="Title for social media blocking.">
         Social Media Blocking
       </message>

components/brave_shields/core/common/filter_list.mojom

@@ -38,3 +38,5 @@ const string kHideYoutubeRecommendedContentUuid
         = "2D57ADED-3531-419A-9DED-7F8868BC1561";
 const string kHideYoutubeDistractingElementsUuid
       = "BD308B90-D3BB-4041-9114-22E096B0BA77";
+const string kHideYoutubeShortsUuid
+      = "9E8EC586-4E17-4E5E-99D7-35172C4CEA74";