Merge "Hide action bar search icon in directories that do not support search operation."
diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
index ea7054f..1474aa6 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java
@@ -151,6 +151,7 @@
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 @@
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 @@
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.