aixan/lawnchair
1
0
Fork 0
mirror of https://github.com/LawnchairLauncher/lawnchair.git synced 2026-02-27 23:36:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix issue when preference screen title won't change depending on the device.." into tm-dev am: 1460a6a0fb am: cb406595ac am: 1aa8ef2249

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/18235011

Change-Id: Ic162d2f8c2a24b32d51bedb94be5c380ee6c59e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Brandon Dayauon
2022-05-18 21:49:10 +00:00
committed by Automerger Merge Worker
parent 465de0ada6 1aa8ef2249
commit 9a7e7fc530
2 changed files with 12 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -438,6 +438,10 @@
<!-- A hint shown in launcher settings develop options filter box -->
<string name="developer_options_filter_hint">Filter</string>
<!-- Title for preference screen show in Home Settings related to smart search preferences. [CHAR LIMIT=50]-->
<string name="search_pref_screen_title">Search your phone</string>
<!-- Title for preference screen show in Home Settings related to smart search preferences. [CHAR LIMIT=50]-->
<string name="search_pref_screen_title_tablet">Search your tablet</string>
<!-- Failed action error message: e.g. Failed: Pause -->
<string name="remote_action_failed">Failed: <xliff:g id="what" example="Pause">%1$s</xliff:g></string>
</resources>

8
src/com/android/launcher3/settings/SettingsActivity.java
View File

@@ -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());
}
}