Isolate Menu/Action management into dedicated manager classes.
We are now also returning fragmentTuner at the activity level, so that
directoryFragment does not have to do a .pick() logic depending on the
activity type. Rather, the logic lies within the activity itself.
Bug: 24416336
Change-Id: Idb200864f6c9468b9193781f6ac505b557ffbce9
diff --git a/src/com/android/documentsui/SearchViewManager.java b/src/com/android/documentsui/SearchViewManager.java
index 11b8891..46a14e6 100644
--- a/src/com/android/documentsui/SearchViewManager.java
+++ b/src/com/android/documentsui/SearchViewManager.java
@@ -37,7 +37,7 @@
/**
* Manages searching UI behavior.
*/
-final class SearchViewManager implements
+public class SearchViewManager implements
SearchView.OnCloseListener, OnQueryTextListener, OnClickListener, OnFocusChangeListener,
OnActionExpandListener {
@@ -46,7 +46,7 @@
void onSearchFinished();
}
- public static final String TAG = "SearchManger";
+ private static final String TAG = "SearchManager";
private SearchManagerListener mListener;
private boolean mSearchExpanded;
@@ -129,7 +129,7 @@
&& ((root.flags & Root.FLAG_SUPPORTS_SEARCH) != 0));
}
- void showMenu(boolean visible) {
+ protected void showMenu(boolean visible) {
if (mMenuItem == null) {
if (DEBUG) Log.d(TAG, "showMenu called before Search MenuItem installed.");
return;