Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(474)

Unified Diff: chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java

Issue 2861863002: offline_items_collection : Added helper class to determine progress (Closed)
Patch Set: comments Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java
index e0eb4cf7f51b43fcfc8c99baaba7a07ca4a9be02..86065017e29745ed9456daf373f1876d5c56050d 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/download/ui/DownloadItemView.java
@@ -21,6 +21,7 @@ import org.chromium.chrome.browser.widget.MaterialProgressBar;
import org.chromium.chrome.browser.widget.TintedImageButton;
import org.chromium.chrome.browser.widget.TintedImageView;
import org.chromium.chrome.browser.widget.selection.SelectableItemView;
+import org.chromium.components.offline_items_collection.OfflineItem.Progress;
import org.chromium.ui.UiUtils;
/**
@@ -164,7 +165,7 @@ public class DownloadItemView extends SelectableItemView<DownloadHistoryItemWrap
showLayout(mLayoutInProgress);
mDownloadStatusView.setText(item.getStatusString());
- boolean isIndeterminate = item.isIndeterminate();
+ Progress progress = item.getDownloadProgress();
if (item.isPaused()) {
mPauseResumeButton.setImageResource(R.drawable.ic_play_arrow_white_24dp);
@@ -175,21 +176,24 @@ public class DownloadItemView extends SelectableItemView<DownloadHistoryItemWrap
mPauseResumeButton.setImageResource(R.drawable.ic_pause_white_24dp);
mPauseResumeButton.setContentDescription(
getContext().getString(R.string.download_notification_pause_button));
- mProgressView.setIndeterminate(isIndeterminate);
+ mProgressView.setIndeterminate(progress.isIndeterminate());
+ }
+
+ if (!progress.isIndeterminate()) {
+ mProgressView.setProgress(progress.getPercentage());
}
- mProgressView.setProgress(item.getDownloadProgress());
// Display the percentage downloaded in text form.
// To avoid problems with RelativeLayout not knowing how to place views relative to
// removed views in the hierarchy, this code instead makes the percentage View's width
// to 0 by removing its text and eliminating the margin.
- if (isIndeterminate) {
+ if (progress.isIndeterminate()) {
mDownloadPercentageView.setText(null);
ApiCompatibilityUtils.setMarginEnd(
(MarginLayoutParams) mDownloadPercentageView.getLayoutParams(), 0);
} else {
mDownloadPercentageView.setText(
- DownloadUtils.getPercentageString(item.getDownloadProgress()));
+ DownloadUtils.getPercentageString(progress.getPercentage()));
ApiCompatibilityUtils.setMarginEnd(
(MarginLayoutParams) mDownloadPercentageView.getLayoutParams(), mMargin);
}

Powered by Google App Engine
This is Rietveld 408576698