From 303b4e8aae2fa690741493d9996d2096214e506f Mon Sep 17 00:00:00 2001 From: Brandon Dayauon Date: Mon, 9 May 2022 14:37:31 -0700 Subject: [PATCH] Fix issue when preference screen title won't change depending on the device.. previously it defaults to just "Search your phone" Now it correctly displays Phone/Tablet Before: https://screenshot.googleplex.com/3PJrsP9mGvwMr98 After: https://screenshot.googleplex.com/B2nnUQHeHmEXXPd Bug: 231611501 Change-Id: I49eab7e827ce4bb31a2722fbf21c244f98145907 --- res/values/strings.xml | 4 ++++ src/com/android/launcher3/settings/SettingsActivity.java | 8 ++++++++ 2 files changed, 12 insertions(+) diff --git a/res/values/strings.xml b/res/values/strings.xml index 829a21ddfa..847e4a8625 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -438,6 +438,10 @@ Filter + + Search your phone + + Search your tablet Failed: %1$s diff --git a/src/com/android/launcher3/settings/SettingsActivity.java b/src/com/android/launcher3/settings/SettingsActivity.java index 0c39632708..49d27b7ed4 100644 --- a/src/com/android/launcher3/settings/SettingsActivity.java +++ b/src/com/android/launcher3/settings/SettingsActivity.java @@ -213,6 +213,14 @@ public class SettingsActivity extends FragmentActivity } if (getActivity() != null && !TextUtils.isEmpty(getPreferenceScreen().getTitle())) { + if (getPreferenceScreen().getTitle().equals( + 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); + } getActivity().setTitle(getPreferenceScreen().getTitle()); } }