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

Commit 9cffd697 authored by Bjorn Bringert's avatar Bjorn Bringert Committed by Steve Kondik
Browse files

Remove Search from the system Settings app DO NOT MERGE 

The search settings acitivity lives in the system search app,
which is build-dependent. Also, since the Browser no longer
looks at the SHOW_WEB_SUGGESTIONS system preference, none
of the search settings affect the behavior of any other
platform apps.

The search settings will henceforth only be
available from within the search app (e.g. QuickSearchBox).

Bug: 3017365

Change-Id: I08f3979cd8cdc0742efbc49be95aa59753c94c0d
parent 069e387b

res/drawable-hdpi/ic_settings_search.png

deleted100755 → 0
−1.59 KiB
Loading image diff...

res/drawable-mdpi/ic_settings_search.png

deleted100755 → 0
−920 B
Loading image diff...

res/xml/settings.xml

+0 −15
Original line number Diff line number Diff line
@@ -155,21 +155,6 @@ 
                android:targetClass="com.android.settings.deviceinfo.Memory" />

        </com.android.settings.IconPreferenceScreen>



        <!-- Search.

             The settings activity will ensure that this is resolved to an

             activity on the system image, otherwise it will remove this

             preference.

             The intent action is the same as

             android.app.SearchManager.INTENT_ACTION_SEARCH_SETTINGS.

             -->



        <com.android.settings.IconPreferenceScreen

            settings:icon="@drawable/ic_settings_search"

            android:title="@string/search_settings"

            android:key="search_settings">

            <intent android:action="android.search.action.SEARCH_SETTINGS" />

        </com.android.settings.IconPreferenceScreen>



        <!-- Language -->



        <com.android.settings.IconPreferenceScreen

src/com/android/settings/Settings.java

+0 −3
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ public class Settings extends PreferenceActivity { 
    private static final String KEY_PARENT = "parent";

    private static final String KEY_CALL_SETTINGS = "call_settings";

    private static final String KEY_SYNC_SETTINGS = "sync_settings";

    private static final String KEY_SEARCH_SETTINGS = "search_settings";

    private static final String KEY_DOCK_SETTINGS = "dock_settings";

    private static final String KEY_LAUNCHER = "launcher_settings";
@@ -47,8 +46,6 @@ public class Settings extends PreferenceActivity { 


        PreferenceGroup parent = (PreferenceGroup) findPreference(KEY_PARENT);

        Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SYNC_SETTINGS, 0);

        Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_SEARCH_SETTINGS, 0);

		Utils.updatePreferenceToSpecificActivityOrRemove(this, parent, KEY_LAUNCHER, 0);

        mLauncherSettings = parent.findPreference(KEY_LAUNCHER);



        Preference dockSettings = parent.findPreference(KEY_DOCK_SETTINGS);