diff options
| author | Jeff Sharkey <jsharkey@android.com> | 2013-08-06 16:26:14 -0700 |
|---|---|---|
| committer | Jeff Sharkey <jsharkey@android.com> | 2013-08-06 18:16:21 -0700 |
| commit | b156f4bf8cdfe475a7116b627d84a281e1a281b7 (patch) | |
| tree | 537c95d8bcf776de593e5dd9ed02f62445ca7147 /packages/DocumentsUI/res/menu | |
| parent | 66516697a29cf00d93893a1011d3befc7c1ee37f (diff) | |
| download | frameworks_base-b156f4bf8cdfe475a7116b627d84a281e1a281b7.zip frameworks_base-b156f4bf8cdfe475a7116b627d84a281e1a281b7.tar.gz frameworks_base-b156f4bf8cdfe475a7116b627d84a281e1a281b7.tar.bz2 | |
Recents in create, uniform item layouts.
Show recent directories in a separate fragment, and save as serialized
versions of new DirectoryStack. Cleaner behavior around recents and
search, instead of treating them as pseudo-Documents.
More uniform item layouts between list and grid, including both date
and size information, and originating storage root in recents. Avoid
clashing directory loaders by assigning unique numbers. Promote
list/grid switching up into activity.
Change-Id: I9a93460b896067ca036d7e772eeabde31face2e1
Diffstat (limited to 'packages/DocumentsUI/res/menu')
| -rw-r--r-- | packages/DocumentsUI/res/menu/activity.xml | 10 | ||||
| -rw-r--r-- | packages/DocumentsUI/res/menu/directory.xml | 28 |
2 files changed, 10 insertions, 28 deletions
diff --git a/packages/DocumentsUI/res/menu/activity.xml b/packages/DocumentsUI/res/menu/activity.xml index a0d03b2..d57f88a 100644 --- a/packages/DocumentsUI/res/menu/activity.xml +++ b/packages/DocumentsUI/res/menu/activity.xml @@ -27,4 +27,14 @@ android:showAsAction="always|collapseActionView" android:actionViewClass="android.widget.SearchView" android:imeOptions="actionSearch" /> + <item + android:id="@+id/menu_grid" + android:title="@string/menu_grid" + android:icon="@drawable/ic_menu_grid" + android:showAsAction="ifRoom" /> + <item + android:id="@+id/menu_list" + android:title="@string/menu_list" + android:icon="@drawable/ic_menu_list" + android:showAsAction="ifRoom" /> </menu> diff --git a/packages/DocumentsUI/res/menu/directory.xml b/packages/DocumentsUI/res/menu/directory.xml deleted file mode 100644 index 12d0324..0000000 --- a/packages/DocumentsUI/res/menu/directory.xml +++ /dev/null @@ -1,28 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<menu xmlns:android="http://schemas.android.com/apk/res/android"> - <item - android:id="@+id/menu_grid" - android:title="@string/menu_grid" - android:icon="@drawable/ic_menu_grid" - android:showAsAction="ifRoom" /> - <item - android:id="@+id/menu_list" - android:title="@string/menu_list" - android:icon="@drawable/ic_menu_list" - android:showAsAction="ifRoom" /> -</menu> |