From e530801f4468c7866df0ee3bcb2d1f0bcfc08a68 Mon Sep 17 00:00:00 2001 From: Brandon Dayauon Date: Tue, 24 Jan 2023 11:09:38 -0800 Subject: [PATCH] Fix preference screen title to make folded devices the same as phone Now it says "Search your Phone" on folded devices instead of "Search your tablet" when unfolded bug: 265610885 test: Manually - on foldables and tablets Change-Id: I39ee08539b70b2e7258bca86b1450c62c75f748f --- src/com/android/launcher3/settings/SettingsActivity.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java index d2f82c2965..8d6a5cbccf 100644 --- a/src/com/android/launcher3/settings/SettingsActivity.java +++ b/src/com/android/launcher3/settings/SettingsActivity.java @@ -226,9 +226,10 @@ public class SettingsActivity extends FragmentActivity 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()); }