bug:3308769 add CAB options to downloads app

Change-Id: I9bb1374b7ca0053210274e5d6981b2f2dcf6bfca

3 files changed, 25 insertions, 36 deletions

diff --git a/ui/res/layout/download_list.xml b/ui/res/layout/download_list.xml
index 8f75baea..395d79a4 100644
--- a/ui/res/layout/download_list.xml
+++ b/ui/res/layout/download_list.xml
@@ -20,10 +20,7 @@
               android:layout_width="match_parent"
               android:layout_height="match_parent"
               android:orientation="vertical">
-    <!-- The main area showing the list of downloads -->
-    <FrameLayout android:layout_width="match_parent"
-                 android:layout_height="match_parent"
-                 android:layout_weight="1">
+
         <ExpandableListView android:id="@+id/date_ordered_list"
                             android:layout_width="match_parent"
                             android:layout_height="match_parent"/>
@@ -37,30 +34,4 @@
                   android:text="@string/no_downloads"
                   android:gravity="center"
                   android:textStyle="bold"/>
-    </FrameLayout>
-
-    <!-- The selection menu that pops up from the bottom of the screen -->
-    <LinearLayout android:id="@+id/selection_menu"
-                  android:orientation="horizontal"
-                  android:visibility="gone"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:paddingTop="5dip"
-                  android:paddingLeft="4dip"
-                  android:paddingRight="4dip"
-                  android:paddingBottom="1dip"
-                  android:gravity="center"
-                  android:layout_gravity="center"
-                  android:background="@android:drawable/bottom_bar">
-          <Button android:id="@+id/selection_delete"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:layout_weight="1"/>
-          <Button android:id="@+id/deselect_all"
-                  android:layout_width="match_parent"
-                  android:layout_height="match_parent"
-                  android:layout_weight="1"
-                  android:text="@string/deselect_all"/>
-
-      </LinearLayout>
 </LinearLayout>
diff --git a/ui/res/menu/download_menu.xml b/ui/res/menu/download_menu.xml
index 6dbcb6e7..95cb6738 100644
--- a/ui/res/menu/download_menu.xml
+++ b/ui/res/menu/download_menu.xml
@@ -17,8 +17,19 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/download_menu_sort_by_size"
         android:title="@string/download_menu_sort_by_size"
-        android:icon="@android:drawable/ic_menu_sort_by_size" />
+        android:icon="@android:drawable/ic_menu_sort_by_size"
+        android:showAsAction="ifRoom" />
+
     <item android:id="@+id/download_menu_sort_by_date"
         android:title="@string/download_menu_sort_by_date"
-        android:icon="@drawable/ic_menu_desk_clock" />
+        android:showAsAction="ifRoom" />
+
+    <item android:id="@+id/delete_download"
+          android:title="@string/delete_download"
+          android:icon="@android:drawable/ic_menu_delete"
+          android:showAsAction="ifRoom" />
+
+    <item android:id="@+id/select_all"
+          android:title="@string/select_all"
+          android:showAsAction="ifRoom" />
 </menu>
diff --git a/ui/res/values/strings.xml b/ui/res/values/strings.xml
index 07f51521..0be08dd6 100644
--- a/ui/res/values/strings.xml
+++ b/ui/res/values/strings.xml
@@ -16,8 +16,10 @@
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <!-- The name of the application that appears in the launcher [CHAR LIMIT=15] -->
     <string name="app_label">Downloads</string>
-    <!-- The title that appears at the top of the activity listing downloads [CHAR LIMIT=25] -->
-    <string name="download_title">Downloads</string>
+    <!-- The title that appears at the top of the activity listing downloads sorted by date [CHAR LIMIT=40] -->
+    <string name="download_title_sorted_by_date">Downloads - Sorted by date</string>
+    <!-- The title that appears at the top of the activity listing downloads sorted by size [CHAR LIMIT=40] -->
+    <string name="download_title_sorted_by_size">Downloads - Sorted by size</string>
 
     <!-- Appears in lieu of the list of downloads if there are no downloads to view
          [CHAR LIMIT=200] -->
@@ -34,7 +36,7 @@
     <string name="download_menu_sort_by_size">Sort by size</string>
     <!-- Menu option to sort the list of downloads by the date/time of the last activity related to
          the download [CHAR LIMIT=25] -->
-    <string name="download_menu_sort_by_date">Sort by time</string>
+    <string name="download_menu_sort_by_date">Sort by date</string>
 
     <!-- Status messages -->
 
@@ -110,5 +112,10 @@
     <string name="retry_download">Retry</string>
     <!-- Text for button appearing in the pop-up selection menu to deselect all currently selected
     downloads in the download list [CHAR LIMIT=25] -->
-    <string name="deselect_all">Clear selection</string>
+    <string name="deselect_all">Deselect All</string>
+    <!-- Text for menu to select all downloads in the download list [CHAR LIMIT=25] -->
+    <string name="select_all">Select All</string>
+    <!-- number of downloads selected [CHAR LIMIT=50] -->
+    <string name="selected_count">Selected %1$d out of %2$d</string>
+
 </resources>