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

Commit 654e25c7 authored by Aga Wronska's avatar Aga Wronska
Browse files

Hide action bar search icon in directories that do not support search operation.

Bug:26593318
Change-Id: Ibb8945e6eba508aaaa55b1f666ac434f30b2aaaa
parent ae605db8
Loading
Loading
Loading
Loading
+7 −0
Original line number Diff line number Diff line
@@ -151,6 +151,7 @@ public abstract class BaseActivity extends Activity implements SearchManagerList
        final MenuItem advanced = menu.findItem(R.id.menu_advanced);
        final MenuItem fileSize = menu.findItem(R.id.menu_file_size);
        final MenuItem settings = menu.findItem(R.id.menu_settings);
        final MenuItem search = menu.findItem(R.id.menu_search);

        // I'm thinkin' this isn't necesary here. If it is...'cuz of a bug....
        // then uncomment the linke and let's get a proper bug reference here.
@@ -167,6 +168,7 @@ public abstract class BaseActivity extends Activity implements SearchManagerList
        fileSize.setVisible(!mState.forceSize);
        advanced.setVisible(!mState.forceAdvanced);
        settings.setVisible((root.flags & Root.FLAG_HAS_SETTINGS) != 0);
        search.setVisible(canSearchRoot());

        advanced.setTitle(LocalPreferences.getDisplayAdvancedDevices(this)
                ? R.string.menu_advanced_hide : R.string.menu_advanced_show);
@@ -384,6 +386,11 @@ public abstract class BaseActivity extends Activity implements SearchManagerList
        return authorities;
    }

    boolean canSearchRoot() {
        final RootInfo root = getCurrentRoot();
        return (root.flags & Root.FLAG_SUPPORTS_SEARCH) != 0;
    }

    final String getCallingPackageMaybeExtra() {
        String callingPackage = getCallingPackage();
        // System apps can set the calling package name using an extra.