From 5a9e58372a89d4557008c91b264b7a238a92ce4a Mon Sep 17 00:00:00 2001
From: Tim Peng <timhypeng@google.com>
Date: Tue, 2 Jun 2020 14:11:54 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=20=E2=80=9CBluetooth=20Audio=20Codec?=
 =?UTF-8?q?=E2=80=9D=20is=20not=20getting=20listed=20while=20searching=20f?=
 =?UTF-8?q?or=20it=20using=20=E2=80=9Ckeywords=E2=80=9D=20from=20settings?=
 =?UTF-8?q?=20search=20tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

-Implement PreferenceControllerMixin to decide nonIndexableKeys list according to isAvailable() status

Bug: 156337281
Test: make -j50 RunSettingsRoboTests
Change-Id: I8787acfd50ac351499781d016a3c806a1a6b4f9f
---
 .../bluetooth/AbstractBluetoothPreferenceController.java       | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java b/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
index 8abe162a08f..6735115c351 100644
--- a/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
+++ b/src/com/android/settings/development/bluetooth/AbstractBluetoothPreferenceController.java
@@ -19,6 +19,7 @@ package com.android.settings.development.bluetooth;
 import android.bluetooth.BluetoothA2dp;
 import android.content.Context;
 
+import com.android.settings.core.PreferenceControllerMixin;
 import com.android.settings.development.BluetoothA2dpConfigStore;
 import com.android.settings.development.BluetoothServiceConnectionListener;
 import com.android.settingslib.core.lifecycle.Lifecycle;
@@ -31,7 +32,7 @@ import com.android.settingslib.development.DeveloperOptionsPreferenceController;
  */
 public abstract class AbstractBluetoothPreferenceController extends
         DeveloperOptionsPreferenceController implements BluetoothServiceConnectionListener,
-        LifecycleObserver, OnDestroy {
+        LifecycleObserver, OnDestroy, PreferenceControllerMixin {
 
     protected volatile BluetoothA2dp mBluetoothA2dp;
 

From d44a2fe211b8163e6c842f236b3564944a3726ac Mon Sep 17 00:00:00 2001
From: Yi-Ling Chuang <emilychuang@google.com>
Date: Thu, 4 Jun 2020 17:14:17 +0800
Subject: [PATCH 2/3] Use the plural format for "See all COUNT apps"

Although there will never be only one app on the device, we still have
to use the plural format for the strings.

Fixes: 146513299
Test: rebuild and see the string in Apps&Notifications page.
Change-Id: I326be50cfddb605584390ebba57dbd06c0ac29b0
---
 res/values/strings.xml                                       | 5 ++++-
 .../applications/RecentAppsPreferenceController.java         | 3 ++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b60bca7e1e0..1a1c9911ca3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4285,7 +4285,10 @@
     <!-- Category title listing recently used apps [CHAR_LIMIT=50]-->
     <string name="recent_app_category_title">Recently opened apps</string>
     <!-- Preference title for showing all apps on device [CHAR_LIMIT=50]-->
-    <string name="see_all_apps_title">See all <xliff:g id="count" example="3">%1$d</xliff:g> apps</string>
+    <plurals name="see_all_apps_title">
+        <item quantity="one">See all apps</item>
+        <item quantity="other">See all %1$d apps</item>
+    </plurals>
 
     <!-- Title of the dialog that asks the user to contact the IT admin to reset password [CHAR LIMIT=40] -->
     <string name="forgot_password_title">Contact your IT admin</string>
diff --git a/src/com/android/settings/applications/RecentAppsPreferenceController.java b/src/com/android/settings/applications/RecentAppsPreferenceController.java
index 69a68ef9e7e..20f9806d35f 100644
--- a/src/com/android/settings/applications/RecentAppsPreferenceController.java
+++ b/src/com/android/settings/applications/RecentAppsPreferenceController.java
@@ -117,7 +117,8 @@ public class RecentAppsPreferenceController extends BasePreferenceController
             @Override
             protected void onCountComplete(int num) {
                 mAppEntitiesController.setHeaderDetails(
-                        mContext.getString(R.string.see_all_apps_title, num));
+                        mContext.getResources().getQuantityString(R.plurals.see_all_apps_title,
+                                num, num));
                 mAppEntitiesController.apply();
             }
         }.execute();

From 6b73e0fc977d706c884168e8aa067b14318932dc Mon Sep 17 00:00:00 2001
From: Tsung-Mao Fang <tmfang@google.com>
Date: Wed, 3 Jun 2020 16:50:04 +0800
Subject: [PATCH 3/3] Add keywords for a few settings

Test: Rebuilt apk, and see the results in settings search.
Fix: 157978733
Change-Id: Ib02adf8b3fd11b619246a2bd050801b9fa5ec7d3
---
 res/values/strings.xml                                   | 9 +++++++++
 res/xml/connected_devices_advanced.xml                   | 3 ++-
 res/xml/language_and_input.xml                           | 3 ++-
 res/xml/sound_settings.xml                               | 3 ++-
 src/com/android/settings/deviceinfo/StorageSettings.java | 1 +
 5 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index b60bca7e1e0..437a3bd82c4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1716,6 +1716,8 @@
 
     <!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
     <string name="wifi_display_settings_title">Cast</string>
+    <!-- Wifi Display settings. The keywords of the setting. [CHAR LIMIT=NONE] -->
+    <string name="keywords_wifi_display_settings">mirror</string>
     <!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->
     <string name="wifi_display_enable_menu_item">Enable wireless display</string>
     <!-- Wifi Display settings. Text that appears when scanning for devices is finished and no nearby device was found [CHAR LIMIT=40]-->
@@ -3283,6 +3285,8 @@
     <string name="storage_menu_free">Free up space</string>
     <!-- Storage setting. Menu option for accessing the storage manager settings. [CHAR LIMIT=30] -->
     <string name="storage_menu_manage">Manage storage</string>
+    <!-- Storage setting. Keywords for Free up space. [CHAR LIMIT=NONE] -->
+    <string name="keywords_storage_menu_free">clean, storage</string>
 
     <!-- Storage setting.  Title for USB transfer settings [CHAR LIMIT=30]-->
     <string name="storage_title_usb">USB computer connection</string>
@@ -4692,6 +4696,8 @@
     <string name="keyboard_and_input_methods_category">Keyboards</string>
     <!-- Title for the 'virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->
     <string name="virtual_keyboard_category">On-screen keyboard</string>
+    <!-- Keywords for the 'virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->
+    <string name="keywords_virtual_keyboard">Gboard</string>
     <!-- Title for the 'available virtual keyboard' preference sub-screen. [CHAR LIMIT=35] -->
     <string name="available_virtual_keyboard_category">Available On-screen keyboard</string>
     <!-- Title for the button to trigger the 'Manage keyboards' preference sub-screen, where the user can turn on/off installed virtual keyboards.[CHAR LIMIT=35] -->
@@ -7748,6 +7754,9 @@
     <!-- Sound: Title for the option managing whether or not to vibrate when ringing. [CHAR LIMIT=30] -->
     <string name="vibrate_when_ringing_title">Vibrate for calls</string>
 
+    <!-- Sound: Keywords for Vibrate for calls. [CHAR LIMIT=NONE] -->
+    <string name="keywords_vibrate_for_calls">Vibration</string>
+
     <!-- Sound: Option for vibrate when ringing setting: Never vibrate. [CHAR LIMIT=40] -->
     <string name="vibrate_when_ringing_option_never_vibrate">Never vibrate</string>
 
diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml
index 958af7fc184..3ff7d9975f8 100644
--- a/res/xml/connected_devices_advanced.xml
+++ b/res/xml/connected_devices_advanced.xml
@@ -41,7 +41,8 @@
         android:title="@string/wifi_display_settings_title"
         android:icon="@drawable/ic_cast_24dp"
         android:order="-6"
-        settings:controller="com.android.settings.wfd.WifiDisplayPreferenceController"/>
+        settings:controller="com.android.settings.wfd.WifiDisplayPreferenceController"
+        settings:keywords="@string/keywords_wifi_display_settings"/>
 
     <com.android.settingslib.RestrictedPreference
         android:fragment="com.android.settings.nfc.AndroidBeam"
diff --git a/res/xml/language_and_input.xml b/res/xml/language_and_input.xml
index c3848e32750..50968d94558 100644
--- a/res/xml/language_and_input.xml
+++ b/res/xml/language_and_input.xml
@@ -33,7 +33,8 @@
         <Preference
             android:key="virtual_keyboard_pref"
             android:title="@string/virtual_keyboard_category"
-            android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment" />
+            android:fragment="com.android.settings.inputmethod.VirtualKeyboardFragment"
+            settings:keywords="@string/keywords_virtual_keyboard"/>
         <Preference
             android:key="physical_keyboard_pref"
             android:title="@string/physical_keyboard_title"
diff --git a/res/xml/sound_settings.xml b/res/xml/sound_settings.xml
index 92f8a3e6acf..eca5f1ea09e 100644
--- a/res/xml/sound_settings.xml
+++ b/res/xml/sound_settings.xml
@@ -96,7 +96,8 @@
         android:key="vibrate_for_calls"
         android:title="@string/vibrate_when_ringing_title"
         android:order="-130"
-        settings:controller="com.android.settings.sound.VibrateForCallsPreferenceController"/>
+        settings:controller="com.android.settings.sound.VibrateForCallsPreferenceController"
+        settings:keywords="@string/keywords_vibrate_for_calls"/>
 
     <!-- Interruptions -->
     <com.android.settingslib.RestrictedPreference
diff --git a/src/com/android/settings/deviceinfo/StorageSettings.java b/src/com/android/settings/deviceinfo/StorageSettings.java
index 14f8deaa44e..871844c5031 100644
--- a/src/com/android/settings/deviceinfo/StorageSettings.java
+++ b/src/com/android/settings/deviceinfo/StorageSettings.java
@@ -619,6 +619,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
                     data.key = KEY_STORAGE_SETTINGS_FREE_SPACE;
                     data.screenTitle = context.getString(R.string.storage_menu_free);
                     data.intentAction = StorageManager.ACTION_MANAGE_STORAGE;
+                    data.keywords = context.getString(R.string.keywords_storage_menu_free);
                     result.add(data);
 
                     return result;