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

Commit 428b3e7d authored by Aga Wronska's avatar Aga Wronska Committed by Android (Google) Code Review
Browse files

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

parents ea4f93bc 654e25c7

src/com/android/documentsui/BaseActivity.java

+7 −0
Original line number Original line 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 advanced = menu.findItem(R.id.menu_advanced);

        final MenuItem fileSize = menu.findItem(R.id.menu_file_size);

        final MenuItem fileSize = menu.findItem(R.id.menu_file_size);

        final MenuItem settings = menu.findItem(R.id.menu_settings);

        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....

        // 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.

        // 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);

        fileSize.setVisible(!mState.forceSize);

        advanced.setVisible(!mState.forceAdvanced);

        advanced.setVisible(!mState.forceAdvanced);

        settings.setVisible((root.flags & Root.FLAG_HAS_SETTINGS) != 0);

        settings.setVisible((root.flags & Root.FLAG_HAS_SETTINGS) != 0);

        search.setVisible(canSearchRoot());





        advanced.setTitle(LocalPreferences.getDisplayAdvancedDevices(this)

        advanced.setTitle(LocalPreferences.getDisplayAdvancedDevices(this)

                ? R.string.menu_advanced_hide : R.string.menu_advanced_show);

                ? R.string.menu_advanced_hide : R.string.menu_advanced_show);
@@ -384,6 +386,11 @@ public abstract class BaseActivity extends Activity implements SearchManagerList 
        return authorities;

        return authorities;

    }

    }





    boolean canSearchRoot() {

        final RootInfo root = getCurrentRoot();

        return (root.flags & Root.FLAG_SUPPORTS_SEARCH) != 0;

    }



    final String getCallingPackageMaybeExtra() {

    final String getCallingPackageMaybeExtra() {

        String callingPackage = getCallingPackage();

        String callingPackage = getCallingPackage();

        // System apps can set the calling package name using an extra.

        // System apps can set the calling package name using an extra.