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

Commit b411aa51 authored by Adnan's avatar Adnan Committed by Adnan Begovic
Browse files

Settings: Disable search item in some fragments. 

Change-Id: I17ed6945f34f2fe7bb18674124f8a8989145b8c1
parent 7b5c19ae

src/com/android/settings/Settings.java

+30 −0
Original line number Diff line number Diff line
@@ -89,6 +89,8 @@ import com.android.settings.bluetooth.BluetoothEnabler; 
import com.android.settings.bluetooth.BluetoothSettings;

import com.android.settings.cyanogenmod.ButtonSettings;

import com.android.settings.cyanogenmod.LockscreenInterface;

import com.android.settings.cyanogenmod.NavBar;

import com.android.settings.cyanogenmod.NavRing;

import com.android.settings.cyanogenmod.PerformanceSettings;

import com.android.settings.cyanogenmod.StatusBar;

import com.android.settings.cyanogenmod.NotificationDrawer;
@@ -96,6 +98,7 @@ import com.android.settings.cyanogenmod.superuser.PolicyNativeFragment; 
import com.android.settings.deviceinfo.Memory;

import com.android.settings.deviceinfo.UsbSettings;

import com.android.settings.fuelgauge.PowerUsageSummary;

import com.android.settings.headsup.HeadsUpSettings;

import com.android.settings.inputmethod.InputMethodAndLanguageSettings;

import com.android.settings.inputmethod.KeyboardLayoutPickerFragment;

import com.android.settings.inputmethod.SpellCheckersSettings;
@@ -112,6 +115,7 @@ import com.android.settings.profiles.AppGroupConfig; 
import com.android.settings.profiles.ProfileConfig;

import com.android.settings.profiles.ProfileEnabler;

import com.android.settings.profiles.ProfilesSettings;

import com.android.settings.quicksettings.QuickSettingsTiles;

import com.android.settings.search.SettingsAutoCompleteTextView;

import com.android.settings.search.SearchPopulator;

import com.android.settings.search.SettingsSearchFilterAdapter;
@@ -153,6 +157,7 @@ public class Settings extends PreferenceActivity 
    private static final String KEY_SCREEN_GESTURE_SETTINGS = "touch_screen_gesture_settings";



    private static final String EXTRA_UI_OPTIONS = "settings:ui_options";

    private static final String EXTRA_DISABLE_SEARCH = "settings:disable_search";



    private static final String SAVE_KEY_CURRENT_HEADER = "com.android.settings.CURRENT_HEADER";

    private static final String SAVE_KEY_PARENT_HEADER = "com.android.settings.PARENT_HEADER";
@@ -164,6 +169,8 @@ public class Settings extends PreferenceActivity 


    private static boolean sShowNoHomeNotice = false;



    private boolean mDisableSearchIcon = false;



    private String mFragmentClass;

    private int mTopLevelHeaderId;

    private Header mFirstHeader;
@@ -273,7 +280,10 @@ public class Settings extends PreferenceActivity 
        mSearchBar.setLayoutParams(layoutParams);

        mSearchBar.setHint(R.string.settings_search_autocompleteview_hint);

        mSearchBar.setThreshold(1);

        mSearchBar.setSingleLine(true);

        mSearchBar.setOnItemClickListener(this);



        mSearchItem.setVisible(!mDisableSearchIcon);

        return true;

    }
@@ -309,6 +319,10 @@ public class Settings extends PreferenceActivity 
            getWindow().setUiOptions(getIntent().getIntExtra(EXTRA_UI_OPTIONS, 0));

        }



        if (getIntent().hasExtra(EXTRA_DISABLE_SEARCH)) {

            mDisableSearchIcon = getIntent().getBooleanExtra(EXTRA_DISABLE_SEARCH, false);

        }



        startPopulatingSearchData();



        mAuthenticatorHelper = new AuthenticatorHelper();
@@ -687,6 +701,22 @@ public class Settings extends PreferenceActivity 
                PrintSettingsFragment.class.getName().equals(fragmentName) ||

                PrintServiceSettingsFragment.class.getName().equals(fragmentName)) {

            intent.putExtra(EXTRA_UI_OPTIONS, ActivityInfo.UIOPTION_SPLIT_ACTION_BAR_WHEN_NARROW);

            // Should also disable the search options here to not confuse

            // the end user

            intent.putExtra(EXTRA_DISABLE_SEARCH, true);

        } else if (ApplicationSettings.class.getName().equals(fragmentName) ||

                DataUsageSummary.class.getName().equals(fragmentName) ||

                QuickSettingsTiles.class.getName().equals(fragmentName) ||

                HeadsUpSettings.class.getName().equals(fragmentName) ||

                PowerUsageSummary.class.getName().equals(fragmentName) ||

                ThemeSettings.class.getName().equals(fragmentName) ||

                ManageApplications.class.getName().equals(fragmentName) ||

                NavBar.class.getName().equals(fragmentName) ||

                NavRing.class.getName().equals(fragmentName) ||

                PaymentSettings.class.getName().equals(fragmentName) ||

                WifiDisplaySettings.class.getName().equals(fragmentName)) {

            // Should force disable search options

            intent.putExtra(EXTRA_DISABLE_SEARCH, true);

        }

        intent.setClass(this, SubSettings.class);

    }