From bfac23fca38be4b07c33f85c7af8a3503ee7f83f Mon Sep 17 00:00:00 2001
From: Zekan Qian <pierreqian@google.com>
Date: Mon, 28 Nov 2022 19:19:04 +0800
Subject: [PATCH] Cleanup setIsAllowSearch in Settings Spa pages

Bug: 244122804
Test: unit-test
Change-Id: Ib690baf0d8cb669e4e58848c78f2848d40314dc0
---
 src/com/android/settings/spa/app/AllAppList.kt                 | 2 +-
 src/com/android/settings/spa/app/AppsMain.kt                   | 2 +-
 .../android/settings/spa/app/specialaccess/SpecialAppAccess.kt | 3 +--
 src/com/android/settings/spa/notification/NotificationMain.kt  | 2 +-
 src/com/android/settings/spa/system/SystemMain.kt              | 2 +-
 5 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/spa/app/AllAppList.kt b/src/com/android/settings/spa/app/AllAppList.kt
index 3331a699a4f..90e5a6b8b4e 100644
--- a/src/com/android/settings/spa/app/AllAppList.kt
+++ b/src/com/android/settings/spa/app/AllAppList.kt
@@ -47,7 +47,7 @@ object AllAppListPageProvider : SettingsPageProvider {
 
     fun buildInjectEntry() = SettingsEntryBuilder
         .createInject(owner = SettingsPage.create(name))
-        .setIsAllowSearch(true)
+        .setSearchDataFn { null }
         .setUiLayoutFn {
             Preference(object : PreferenceModel {
                 override val title = stringResource(R.string.all_apps)
diff --git a/src/com/android/settings/spa/app/AppsMain.kt b/src/com/android/settings/spa/app/AppsMain.kt
index 6fcc48042be..4b472784e55 100644
--- a/src/com/android/settings/spa/app/AppsMain.kt
+++ b/src/com/android/settings/spa/app/AppsMain.kt
@@ -49,7 +49,7 @@ object AppsMainPageProvider : SettingsPageProvider {
     }
 
     fun buildInjectEntry() =
-        SettingsEntryBuilder.createInject(owner = owner).setIsAllowSearch(false)
+        SettingsEntryBuilder.createInject(owner = owner)
             .setUiLayoutFn {
                 Preference(object : PreferenceModel {
                     override val title = stringResource(R.string.apps_dashboard_title)
diff --git a/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt b/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
index f7dea34c072..560264961c9 100644
--- a/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
+++ b/src/com/android/settings/spa/app/specialaccess/SpecialAppAccess.kt
@@ -49,8 +49,7 @@ object SpecialAppAccessPageProvider : SettingsPageProvider {
         })
     }
 
-    fun buildInjectEntry() =
-        SettingsEntryBuilder.createInject(owner = SettingsPage.create(name)).setIsAllowSearch(false)
+    fun buildInjectEntry() = SettingsEntryBuilder.createInject(owner = SettingsPage.create(name))
 
     override fun buildEntry(arguments: Bundle?): List<SettingsEntry> {
         val owner = SettingsPage.create(name, parameter = parameter, arguments = arguments)
diff --git a/src/com/android/settings/spa/notification/NotificationMain.kt b/src/com/android/settings/spa/notification/NotificationMain.kt
index 5a0634cb8b1..2324dd85996 100644
--- a/src/com/android/settings/spa/notification/NotificationMain.kt
+++ b/src/com/android/settings/spa/notification/NotificationMain.kt
@@ -49,7 +49,7 @@ object NotificationMainPageProvider : SettingsPageProvider {
     }
 
     fun buildInjectEntry(): SettingsEntryBuilder {
-        return SettingsEntryBuilder.createInject(owner = owner).setIsAllowSearch(false)
+        return SettingsEntryBuilder.createInject(owner = owner)
             .setUiLayoutFn {
                 Preference(object : PreferenceModel {
                     override val title = stringResource(R.string.configure_notification_settings)
diff --git a/src/com/android/settings/spa/system/SystemMain.kt b/src/com/android/settings/spa/system/SystemMain.kt
index a004103bb3a..6e07a197d5b 100644
--- a/src/com/android/settings/spa/system/SystemMain.kt
+++ b/src/com/android/settings/spa/system/SystemMain.kt
@@ -49,7 +49,7 @@ object SystemMainPageProvider : SettingsPageProvider {
     }
 
     fun buildInjectEntry(): SettingsEntryBuilder {
-        return SettingsEntryBuilder.createInject(owner = owner).setIsAllowSearch(false)
+        return SettingsEntryBuilder.createInject(owner = owner)
             .setUiLayoutFn {
                 Preference(object : PreferenceModel {
                     override val title = stringResource(R.string.header_category_system)