diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-07-31 20:53:22 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2013-07-31 21:03:09 -0700 |
| commit | bc2971d2499f5bf5534ced7296ece630ca902738 (patch) | |
| tree | 3869ca1f16028c13ccd6b1f521c5291bd91c0095 /packages/DocumentsUI/res/menu | |
| parent | 20d96d8aff2193d548977e23ce5158657cac94e0 (diff) | |
| download | frameworks_base-bc2971d2499f5bf5534ced7296ece630ca902738.zip frameworks_base-bc2971d2499f5bf5534ced7296ece630ca902738.tar.gz frameworks_base-bc2971d2499f5bf5534ced7296ece630ca902738.tar.bz2 | |
Sliding drawer for roots, move sorting, search.
Move backend root exploration into sliding drawer, and adjust action
bar when moving between modes. Moves sorting into action bar spinner
instead of separate dialog. Also add initial search support.
Change-Id: I70189911ba56ae6bd93d5c503a8600acd6d6c0c5
Diffstat (limited to 'packages/DocumentsUI/res/menu')
| -rw-r--r-- | packages/DocumentsUI/res/menu/activity.xml | 9 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/menu/directory.xml | 5 |
2 files changed, 8 insertions, 6 deletions
diff --git a/packages/DocumentsUI/res/menu/activity.xml b/packages/DocumentsUI/res/menu/activity.xml index bf7c161..a0d03b2 100644 --- a/packages/DocumentsUI/res/menu/activity.xml +++ b/packages/DocumentsUI/res/menu/activity.xml @@ -19,5 +19,12 @@ android:id="@+id/menu_create_dir" android:title="@string/menu_create_dir" android:icon="@drawable/ic_menu_create_dir" - android:showAsAction="always" /> + android:showAsAction="ifRoom" /> + <item + android:id="@+id/menu_search" + android:title="@string/menu_search" + android:icon="@drawable/ic_menu_search" + android:showAsAction="always|collapseActionView" + android:actionViewClass="android.widget.SearchView" + android:imeOptions="actionSearch" /> </menu> diff --git a/packages/DocumentsUI/res/menu/directory.xml b/packages/DocumentsUI/res/menu/directory.xml index c1fa228..12d0324 100644 --- a/packages/DocumentsUI/res/menu/directory.xml +++ b/packages/DocumentsUI/res/menu/directory.xml @@ -25,9 +25,4 @@ android:title="@string/menu_list" android:icon="@drawable/ic_menu_list" android:showAsAction="ifRoom" /> - <item - android:id="@+id/menu_sort" - android:title="@string/menu_sort" - android:icon="@drawable/ic_menu_sort" - android:showAsAction="ifRoom" /> </menu> |