import com.android.gallery3d.R;
import com.android.gallery3d.app.NotificationIds;
import com.android.gallery3d.data.MtpClient;
-import com.android.gallery3d.ingest.data.MtpBitmapFetch;
import com.android.gallery3d.util.BucketNames;
import java.util.ArrayList;
private NotificationManager mNotificationManager;
private NotificationCompat.Builder mNotificationBuilder;
private long mLastProgressIndexTime = 0;
+ private boolean mNeedRelaunchNotification = false;
@Override
public void onCreate() {
protected void setClientActivity(IngestActivity activity) {
if (mClientActivity == activity) return;
mClientActivity = activity;
- if (mClientActivity == null) return;
+ if (mClientActivity == null) {
+ if (mNeedRelaunchNotification) {
+ mNotificationBuilder.setProgress(0, 0, false)
+ .setContentText(getResources().getText(R.string.ingest_scanning_done));
+ mNotificationManager.notify(NotificationIds.INGEST_NOTIFICATION_SCANNING,
+ mNotificationBuilder.build());
+ }
+ return;
+ }
mNotificationManager.cancel(NotificationIds.INGEST_NOTIFICATION_IMPORTING);
mNotificationManager.cancel(NotificationIds.INGEST_NOTIFICATION_SCANNING);
if (mRedeliverImportFinish) {
public void deviceRemoved(MtpDevice device) {
if (device == mDevice) {
setDevice(null);
+ mNeedRelaunchNotification = false;
}
}
if (pathIfSuccessful != null) {
mScannerClient.scanPath(pathIfSuccessful);
}
+ mNeedRelaunchNotification = false;
if (mClientActivity != null) {
mClientActivity.onImportProgress(visitedCount, totalCount, pathIfSuccessful);
}
@Override
public void onImportFinish(Collection<MtpObjectInfo> objectsNotImported) {
stopForeground(true);
+ mNeedRelaunchNotification = true;
if (mClientActivity != null) {
mClientActivity.onImportFinish(objectsNotImported);
} else {
@Override
public void onObjectIndexed(MtpObjectInfo object, int numVisited) {
+ mNeedRelaunchNotification = false;
if (mClientActivity != null) {
mClientActivity.onObjectIndexed(object, numVisited);
} else {
@Override
public void onIndexFinish() {
+ mNeedRelaunchNotification = true;
if (mClientActivity != null) {
mClientActivity.onIndexFinish();
} else {