summaryrefslogtreecommitdiffstats
path: root/src/com/android/gallery3d/ingest
diff options
context:
space:
mode:
authorBobby Georgescu <georgescu@google.com>2013-01-16 22:39:01 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-01-16 22:39:01 +0000
commit01e4d3a4d112832d33409adf6f8e0c0ac09b7b1e (patch)
tree0bfc9818512a8ac6148e74fb9707f74556799d98 /src/com/android/gallery3d/ingest
parent9003bd581c00a31db4c8291c99a30d5e74fe2dde (diff)
parentdd8784f2a9dc18f8ce2951ef1edaf2e6e63d93b0 (diff)
downloadandroid_packages_apps_Snap-01e4d3a4d112832d33409adf6f8e0c0ac09b7b1e.tar.gz
android_packages_apps_Snap-01e4d3a4d112832d33409adf6f8e0c0ac09b7b1e.tar.bz2
android_packages_apps_Snap-01e4d3a4d112832d33409adf6f8e0c0ac09b7b1e.zip
Merge "Always have determinate progress in import notification" into gb-ub-photos-bryce
Diffstat (limited to 'src/com/android/gallery3d/ingest')
-rw-r--r--src/com/android/gallery3d/ingest/IngestService.java9
1 files changed, 4 insertions, 5 deletions
diff --git a/src/com/android/gallery3d/ingest/IngestService.java b/src/com/android/gallery3d/ingest/IngestService.java
index 2ca4d4ca2..12b056b60 100644
--- a/src/com/android/gallery3d/ingest/IngestService.java
+++ b/src/com/android/gallery3d/ingest/IngestService.java
@@ -188,12 +188,11 @@ public class IngestService extends Service implements ImportTask.Listener,
}
if (mClientActivity != null) {
mClientActivity.onImportProgress(visitedCount, totalCount, pathIfSuccessful);
- } else {
- mNotificationBuilder.setProgress(totalCount, visitedCount, false)
- .setContentText(getResources().getText(R.string.ingest_importing));
- mNotificationManager.notify(NotificationIds.INGEST_NOTIFICATION_IMPORTING,
- mNotificationBuilder.build());
}
+ mNotificationBuilder.setProgress(totalCount, visitedCount, false)
+ .setContentText(getResources().getText(R.string.ingest_importing));
+ mNotificationManager.notify(NotificationIds.INGEST_NOTIFICATION_IMPORTING,
+ mNotificationBuilder.build());
}
@Override