From 2e005e1e284dc7a06e4eb47ad2d883ee23fcaf40 Mon Sep 17 00:00:00 2001 From: Sunny Goyal Date: Thu, 16 Nov 2023 12:53:54 -0800 Subject: [PATCH] Removing unused title change logic in settings Bug: 305084752 Test: Manual Flag: N/A Change-Id: I93e8a58c579223d5892528a47cff5bcafd69dbf1 --- res/values/strings.xml | 4 ---- .../android/launcher3/settings/SettingsActivity.java | 11 ----------- 2 files changed, 15 deletions(-) diff --git a/res/values/strings.xml b/res/values/strings.xml index f08f8f0ab4..b92db125f9 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -447,10 +447,6 @@ 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 650fbcc96a..8cb15a5e6c 100644 --- a/src/com/android/launcher3/settings/SettingsActivity.java +++ b/src/com/android/launcher3/settings/SettingsActivity.java @@ -50,8 +50,6 @@ import androidx.preference.PreferenceScreen; import androidx.recyclerview.widget.RecyclerView; import com.android.launcher3.BuildConfig; -import com.android.launcher3.DeviceProfile; -import com.android.launcher3.InvariantDeviceProfile; import com.android.launcher3.LauncherFiles; import com.android.launcher3.R; import com.android.launcher3.Utilities; @@ -206,15 +204,6 @@ 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.isMultiDisplay - || mDeviceProfile.isPhone ? - R.string.search_pref_screen_title : - R.string.search_pref_screen_title_tablet); - } getActivity().setTitle(getPreferenceScreen().getTitle()); } }