commit 5809508f259a09e53cf5106d8d8908afa2fb50a8
author Brandon Dayauon <brdayauon@google.com> Wed Jan 25 21:38:17 2023 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jan 25 21:38:17 2023 +0000
tree 3b6ab5b53bd85f3108a0de803f30457a74174bbf
parent 8653f1484c9e1165d001c16adead85c00aaa7573
parent e530801f4468c7866df0ee3bcb2d1f0bcfc08a68

Merge "Fix preference screen title to make folded devices the same as phone" into tm-qpr-dev

src/com/android/launcher3/settings/SettingsActivity.java

diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java
index d2f82c2..8d6a5cb 100644
--- a/src/com/android/launcher3/settings/SettingsActivity.java
+++ b/src/com/android/launcher3/settings/SettingsActivity.java
@@ -226,9 +226,10 @@
                         getResources().getString(R.string.search_pref_screen_title))){
                     DeviceProfile mDeviceProfile = InvariantDeviceProfile.INSTANCE.get(
                             getContext()).getDeviceProfile(getContext());
-                    getPreferenceScreen().setTitle(mDeviceProfile.isTablet ?
-                            R.string.search_pref_screen_title_tablet
-                            : R.string.search_pref_screen_title);
+                    getPreferenceScreen().setTitle(mDeviceProfile.isMultiDisplay
+                            || mDeviceProfile.isPhone ?
+                            R.string.search_pref_screen_title :
+                            R.string.search_pref_screen_title_tablet);
                 }
                 getActivity().setTitle(getPreferenceScreen().getTitle());
             }