Merge "Clean up stats stubs." into gb-ub-photos-denali
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index 64a80e6..d7f1154 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -709,6 +709,10 @@
mCameraAppUI.getFilmstripBottomControls().setProgress(progress);
}
+ private void updateSessionProgressText(CharSequence message) {
+ mCameraAppUI.getFilmstripBottomControls().setProgressText(message);
+ }
+
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private void setupNfcBeamPush() {
NfcAdapter adapter = NfcAdapter.getDefaultAdapter(mAppContext);
@@ -801,6 +805,18 @@
}
@Override
+ public void onSessionProgressText(final Uri uri, final CharSequence message) {
+ int currentDataId = mFilmstripController.getCurrentId();
+ if (currentDataId == -1) {
+ return;
+ }
+ if (uri.equals(
+ mDataAdapter.getLocalData(currentDataId).getUri())) {
+ updateSessionProgressText(message);
+ }
+ }
+
+ @Override
public void onSessionUpdated(Uri uri) {
mDataAdapter.refresh(uri);
}
diff --git a/src/com/android/camera/session/CaptureSessionManager.java b/src/com/android/camera/session/CaptureSessionManager.java
index 38f766a..d27001a 100644
--- a/src/com/android/camera/session/CaptureSessionManager.java
+++ b/src/com/android/camera/session/CaptureSessionManager.java
@@ -59,6 +59,9 @@
/** Called when the session with the given Uri has progressed. */
public void onSessionProgress(Uri mediaUri, int progress);
+
+ /** Called when the session with the given Uri has changed its progress text. */
+ public void onSessionProgressText(Uri mediaUri, CharSequence message);
}
/**
diff --git a/src/com/android/camera/session/CaptureSessionManagerImpl.java b/src/com/android/camera/session/CaptureSessionManagerImpl.java
index 0cfa82a..10e0d04 100644
--- a/src/com/android/camera/session/CaptureSessionManagerImpl.java
+++ b/src/com/android/camera/session/CaptureSessionManagerImpl.java
@@ -112,6 +112,7 @@
@Override
public synchronized void setProgressMessage(CharSequence message) {
mProgressMessage = message;
+ notifyTaskProgressText(mUri, message);
for (ProgressListener listener : mProgressListeners) {
listener.onStatusMessageChanged(message);
}
@@ -458,6 +459,23 @@
}
/**
+ * Notifies all task listeners that the task with the given URI has
+ * changed its progress message.
+ */
+ private void notifyTaskProgressText(final Uri uri, final CharSequence message) {
+ mMainHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ synchronized (mTaskListeners) {
+ for (SessionListener listener : mTaskListeners) {
+ listener.onSessionProgressText(uri, message);
+ }
+ }
+ }
+ });
+ }
+
+ /**
* Notifies all task listeners that the task with the given URI has updated
* its media.
*/