diff options
author | Vasu Nori <vnori@google.com> | 2011-02-25 17:22:51 -0800 |
---|---|---|
committer | Vasu Nori <vnori@google.com> | 2011-03-02 13:56:09 -0800 |
commit | d58f7c299ec6e1164e3b5e9e2e3fe5e0e57e63b9 (patch) | |
tree | ffc43f99ab87b5bcc73dd3da0e359049a79859fa /ui/res | |
parent | 3ff0baf4ed8eaba1b21979335ff1b9d8b2fede70 (diff) | |
download | android_packages_providers_DownloadProvider-d58f7c299ec6e1164e3b5e9e2e3fe5e0e57e63b9.tar.gz android_packages_providers_DownloadProvider-d58f7c299ec6e1164e3b5e9e2e3fe5e0e57e63b9.tar.bz2 android_packages_providers_DownloadProvider-d58f7c299ec6e1164e3b5e9e2e3fe5e0e57e63b9.zip |
bug:3404934 implement share as one of the menu options
Change-Id: I51fec5314722d2ec046f8d2acd60c77efd120f74
Diffstat (limited to 'ui/res')
-rw-r--r-- | ui/res/layout/download_list.xml | 34 | ||||
-rw-r--r-- | ui/res/menu/download_menu.xml | 18 | ||||
-rw-r--r-- | ui/res/values/strings.xml | 15 |
3 files changed, 44 insertions, 23 deletions
diff --git a/ui/res/layout/download_list.xml b/ui/res/layout/download_list.xml index 395d79a4..a49cf22a 100644 --- a/ui/res/layout/download_list.xml +++ b/ui/res/layout/download_list.xml @@ -19,12 +19,28 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical"> + android:orientation="vertical" + android:divider="?android:attr/dividerHorizontal" + android:showDividers="middle" + android:dividerPadding="16dip"> + + <!-- The main area showing the list of downloads --> + <FrameLayout android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="1"> <ExpandableListView android:id="@+id/date_ordered_list" + android:paddingLeft="16dip" + android:paddingRight="16dip" + android:paddingBottom="16dip" + android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="match_parent"/> <ListView android:id="@+id/size_ordered_list" + android:paddingLeft="16dip" + android:paddingRight="16dip" + android:paddingBottom="16dip" + android:clipToPadding="false" android:layout_width="match_parent" android:layout_height="match_parent"/> <TextView xmlns:android="http://schemas.android.com/apk/res/android" @@ -34,4 +50,20 @@ 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/sort_menu" + android:orientation="horizontal" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" + style="?android:attr/buttonBarStyle"> + + <Button android:id="@+id/sort_button" + style="?android:attr/buttonBarButtonStyle" + android:layout_width="0dip" + android:layout_weight="1" + android:layout_height="match_parent"/> + </LinearLayout> </LinearLayout> diff --git a/ui/res/menu/download_menu.xml b/ui/res/menu/download_menu.xml index 95cb6738..fc578920 100644 --- a/ui/res/menu/download_menu.xml +++ b/ui/res/menu/download_menu.xml @@ -15,21 +15,11 @@ --> <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:showAsAction="ifRoom" /> - - <item android:id="@+id/download_menu_sort_by_date" - android:title="@string/download_menu_sort_by_date" - android:showAsAction="ifRoom" /> + <item android:id="@+id/share_download" + android:icon="@android:drawable/ic_menu_share" + android:showAsAction="always" /> <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" /> + android:showAsAction="always" /> </menu> diff --git a/ui/res/values/strings.xml b/ui/res/values/strings.xml index 0be08dd6..90095231 100644 --- a/ui/res/values/strings.xml +++ b/ui/res/values/strings.xml @@ -29,14 +29,10 @@ [CHAR LIMIT=20] --> <string name="missing_title"><Unknown></string> - <!-- Menu items --> - - <!-- Menu option to sort the list of downloads by the size of the downloaded file - [CHAR LIMIT=25] --> - <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 date</string> + <!-- Button to display sort-by-size option [CHAR LIMIT=25] --> + <string name="button_sort_by_size">Sort by size</string> + <!-- Button to display sort-by-date option [CHAR LIMIT=25] --> + <string name="button_sort_by_date">Sort by date</string> <!-- Status messages --> @@ -117,5 +113,8 @@ <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> + <!-- title shown when displaying list of apps to choose from when share is clicked on + [CHAR LIMIT = 20] --> + <string name="download_share_dialog">Share via</string> </resources> |