diff options
| author | 2016-03-08 23:29:23 +0000 | |
|---|---|---|
| committer | 2016-03-08 23:29:24 +0000 | |
| commit | ebc3c60fb9d2fdbbd436d3f3325e8239cc26165b (patch) | |
| tree | 10087e18bfb5a319deb1592a37aa1157125bdf4e | |
| parent | 2289efa6d9b7c185e427b0162a89de8e2b9595c8 (diff) | |
| parent | f830017bd7daf69cf5ddb461cc94b11df9f24d21 (diff) | |
Merge "Show more menu items on larger devices." into nyc-dev
| -rw-r--r-- | packages/DocumentsUI/res/menu/activity.xml | 2 | ||||
| -rw-r--r-- | packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/packages/DocumentsUI/res/menu/activity.xml b/packages/DocumentsUI/res/menu/activity.xml index 79f6fa994232..2aee569e8086 100644 --- a/packages/DocumentsUI/res/menu/activity.xml +++ b/packages/DocumentsUI/res/menu/activity.xml @@ -66,7 +66,7 @@ android:id="@+id/menu_sort" android:title="@string/menu_sort" android:icon="@drawable/ic_menu_sortby" - android:showAsAction="never"> + android:showAsAction="ifRoom"> <menu> <item android:id="@+id/menu_sort_name" diff --git a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java index 6efe9d17d203..c9d18b3791e6 100644 --- a/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java +++ b/packages/DocumentsUI/src/com/android/documentsui/BaseActivity.java @@ -154,7 +154,7 @@ public abstract class BaseActivity extends Activity final MenuItem fileSize = menu.findItem(R.id.menu_file_size); // Search uses backend ranking; no sorting, recents doesn't support sort. - sort.setVisible(!inRecents && !mSearchManager.isSearching()); + sort.setEnabled(!inRecents && !mSearchManager.isSearching()); sortSize.setVisible(mState.showSize); // Only sort by size when file sizes are visible fileSize.setVisible(!mState.forceSize); @@ -244,6 +244,7 @@ public abstract class BaseActivity extends Activity return true; case R.id.menu_search: + // SearchViewManager listens for this directly. return false; case R.id.menu_sort_name: @@ -366,6 +367,7 @@ public abstract class BaseActivity extends Activity assert(canSearchRoot()); reloadSearch(query); + invalidateOptionsMenu(); } private void reloadSearch(String query) { |