Merge "Increase timeout for domains with many DNS entries." into jb-mr2-dev
Jeff Sharkey [Thu, 21 Mar 2013 00:07:11 +0000 (00:07 +0000)]
src/com/android/providers/downloads/DownloadThread.java
ui/res/menu/download_menu.xml

index a0b3e54..f1add24 100644 (file)
@@ -818,6 +818,10 @@ public class DownloadThread implements Runnable {
             conn.addRequestProperty("User-Agent", userAgent());
         }
 
+        // Defeat transparent gzip compression, since it doesn't allow us to
+        // easily resume partial downloads.
+        conn.setRequestProperty("Accept-Encoding", "identity");
+
         if (state.mContinuingDownload) {
             if (state.mHeaderETag != null) {
                 conn.addRequestProperty("If-Match", state.mHeaderETag);
index fc57892..a33dd52 100644 (file)
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:id="@+id/share_download"
           android:icon="@android:drawable/ic_menu_share"
+          android:title="@string/download_share_dialog"
           android:showAsAction="always" />
 
     <item android:id="@+id/delete_download"
           android:icon="@android:drawable/ic_menu_delete"
+          android:title="@string/delete_download"
           android:showAsAction="always" />
 </menu>