Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f7e7843a authored by Sunny Goyal's avatar Sunny Goyal Committed by Android (Google) Code Review
Browse files

Merge "Removing unused title change logic in settings" into main

parents a2825e01 2e005e1e

res/values/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -447,10 +447,6 @@ 
    <!-- 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>

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

+0 −11
Original line number Diff line number Diff line
@@ -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());

            }

        }