From 006a8684ffcc8cb392ccbd7eff5a9e00209c96c6 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Wed, 10 Sep 2014 00:12:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E9=80=9A=E7=9F=A5=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=81=9C=E6=AD=A2=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 res/values/themes.xml                         |  2 +-
 .../ehviewer/service/DownloadService.java     | 25 ++++++++++++++++---
 .../ehviewer/ui/GalleryListActivity.java      |  7 +++---
 3 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/res/values/themes.xml b/res/values/themes.xml
index 9567b59d4..4af36636d 100644
--- a/res/values/themes.xml
+++ b/res/values/themes.xml
@@ -16,7 +16,7 @@
 <resources>
 
     <!-- Application theme. -->
-    <style name="AppTheme" parent="@android:Theme.Holo.Light">
+    <style name="AppTheme" parent="@android:Theme.Holo.Light.DarkActionBar">
 
         <item name="@android:textAppearance">@style/TextAppearance</item>
         <item name="@android:windowBackground">@color/background_light</item>
diff --git a/src/com/hippo/ehviewer/service/DownloadService.java b/src/com/hippo/ehviewer/service/DownloadService.java
index 193e8e7a7..afdff84fd 100644
--- a/src/com/hippo/ehviewer/service/DownloadService.java
+++ b/src/com/hippo/ehviewer/service/DownloadService.java
@@ -24,6 +24,7 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Binder;
 import android.os.IBinder;
+import android.support.v4.app.NotificationCompat;
 
 import com.hippo.ehviewer.R;
 import com.hippo.ehviewer.data.Data;
@@ -41,7 +42,8 @@ public class DownloadService extends Service
     private static final String TAG = DownloadService.class.getSimpleName();
     private static final int DOWNLOAD_NOTIFY_ID = -1;
 
-    public static final String ACTION_UPDATE = "com.hippo.ehviewer.service.DownloadService";
+    public static final String ACTION_UPDATE = "com.hippo.ehviewer.service.DownloadService.UPDATE";
+    public static final String ACTION_STOP = "com.hippo.ehviewer.service.DownloadService.STOP";
 
     private Context mContext;
     private Data mData;
@@ -50,7 +52,7 @@ public class DownloadService extends Service
     private volatile ExDownloader mCurExDownloader = null;
     private ServiceBinder mBinder = null;
     private NotificationManager mNotifyManager;
-    private Notification.Builder mBuilder;
+    private NotificationCompat.Builder mBuilder;
     private String mSpeedStr = null;
 
     @Override
@@ -68,6 +70,10 @@ public class DownloadService extends Service
 
     @Override
     public int onStartCommand(Intent intent, int flags, int startId) {
+
+        if (ACTION_STOP.equals(intent.getAction()))
+            stopCurrentTask();
+
         return START_NOT_STICKY;
     }
 
@@ -156,6 +162,11 @@ public class DownloadService extends Service
         }
     }
 
+    public void stopCurrentTask() {
+        if (mCurDownloadInfo != null)
+            stop(mCurDownloadInfo);
+    }
+
     public void startAll() {
         for (DownloadInfo di : mData.getAllDownloads()) {
             if (di.state == DownloadInfo.STATE_NONE ||
@@ -214,12 +225,18 @@ public class DownloadService extends Service
         if (mBuilder != null)
             return;
 
-        mBuilder = new Notification.Builder(mContext);
+        mBuilder = new NotificationCompat.Builder(mContext);
         mBuilder.setSmallIcon(R.drawable.ic_launcher);
         Intent intent = new Intent(DownloadService.this,DownloadActivity.class);
         PendingIntent pendingIntent = PendingIntent.getActivity(DownloadService.this, 0, intent, PendingIntent.FLAG_UPDATE_CURRENT);
         mBuilder.setContentIntent(pendingIntent);
-        mBuilder.setOngoing(false).setAutoCancel(false);
+        mBuilder.setOngoing(true).setAutoCancel(false);
+
+        // Add action
+        Intent stopIntent = new Intent(this, DownloadService.class);
+        stopIntent.setAction(ACTION_STOP);
+        PendingIntent piStop = PendingIntent.getService(this, 0, stopIntent, 0);
+        mBuilder.addAction(R.drawable.ic_clear, getString(R.string.stop), piStop);
     }
 
     @Override
diff --git a/src/com/hippo/ehviewer/ui/GalleryListActivity.java b/src/com/hippo/ehviewer/ui/GalleryListActivity.java
index a1ba544b9..81f377cd5 100644
--- a/src/com/hippo/ehviewer/ui/GalleryListActivity.java
+++ b/src/com/hippo/ehviewer/ui/GalleryListActivity.java
@@ -1262,8 +1262,8 @@ public class GalleryListActivity extends AbsGalleryActivity
 
         SearchManager searchManager =
                 (SearchManager) getSystemService(Context.SEARCH_SERVICE);
-        mSearchView =
-                (SearchView) menu.findItem(R.id.action_search).getActionView();
+        final MenuItem searchItem = menu.findItem(R.id.action_search);
+        mSearchView = (SearchView) searchItem.getActionView();
         mSearchView.setSearchableInfo(
                 searchManager.getSearchableInfo(getComponentName()));
         mSearchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() {
@@ -1279,7 +1279,8 @@ public class GalleryListActivity extends AbsGalleryActivity
                         SimpleSuggestionProvider.MODE);
                 suggestions.saveRecentQuery(query, null);
 
-                mSearchView.clearFocus();
+                searchItem.collapseActionView();
+
                 String t = null;
                 if (query == null || query.isEmpty())
                     t = getString(android.R.string.search_go);