summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Kwa <kenobi@google.com>2015-03-31 16:19:11 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-03-31 16:19:12 +0000
commit3c0439bed6a59dfdf944ab773148b3b8c8739b01 (patch)
tree3f97d000e616f8ca6e9b58f37ff3a7c547567071
parent9e6afce34a07257bbd15b51851ac7394823e0ab7 (diff)
parent3bcc9488a17b25e569c982e9e7596e6d34384c5b (diff)
downloadframeworks_base-3c0439bed6a59dfdf944ab773148b3b8c8739b01.zip
frameworks_base-3c0439bed6a59dfdf944ab773148b3b8c8739b01.tar.gz
frameworks_base-3c0439bed6a59dfdf944ab773148b3b8c8739b01.tar.bz2
Merge "Add a "Select All" menu item and code."
-rw-r--r--packages/DocumentsUI/res/menu/mode_directory.xml4
-rw-r--r--packages/DocumentsUI/res/values/strings.xml2
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java8
3 files changed, 14 insertions, 0 deletions
diff --git a/packages/DocumentsUI/res/menu/mode_directory.xml b/packages/DocumentsUI/res/menu/mode_directory.xml
index 0a3645f..695060d 100644
--- a/packages/DocumentsUI/res/menu/mode_directory.xml
+++ b/packages/DocumentsUI/res/menu/mode_directory.xml
@@ -29,4 +29,8 @@
android:icon="@drawable/ic_menu_delete"
android:title="@string/menu_delete"
android:showAsAction="always" />
+ <item
+ android:id="@+id/menu_select_all"
+ android:title="@string/menu_select_all"
+ android:showAsAction="never" />
</menu>
diff --git a/packages/DocumentsUI/res/values/strings.xml b/packages/DocumentsUI/res/values/strings.xml
index 268ce18..4ad337d 100644
--- a/packages/DocumentsUI/res/values/strings.xml
+++ b/packages/DocumentsUI/res/values/strings.xml
@@ -46,6 +46,8 @@
<string name="menu_delete">Delete</string>
<!-- Menu item title that selects the current directory [CHAR LIMIT=48] -->
<string name="menu_select">Select \"<xliff:g id="directory" example="My Directory">^1</xliff:g>\"</string>
+ <!-- Menu item title that selects all documents in the current directory [CHAR LIMIT=24] -->
+ <string name="menu_select_all">Select All</string>
<!-- Menu item that reveals internal storage built into the device [CHAR LIMIT=24] -->
<string name="menu_advanced_show" product="nosdcard">Show internal storage</string>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
index f55912c..a75dc42 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
@@ -501,6 +501,14 @@ public class DirectoryFragment extends Fragment {
mode.finish();
return true;
+ } else if (id == R.id.menu_select_all) {
+ int count = mCurrentView.getCount();
+ for (int i = 0; i < count; i++) {
+ mCurrentView.setItemChecked(i, true);
+ }
+ updateDisplayState();
+ return true;
+
} else {
return false;
}