diff --git a/res/values/strings.xml b/res/values/strings.xml
index bb6f50d..1ca8c83 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -86,7 +86,7 @@
LineageOS %1$s
LineageOS %1$s - %2$s
%1$s of %2$s • %3$s
- %1$s of %2$s (%3$s left) • %4$s
+ %1$s of %2$s (%3$s) • %4$s
Verifying update
No new updates found. To manually check for new updates, use the Refresh button.
@@ -115,17 +115,17 @@
Export error
Already exporting an update
-
- - 1 second
- - %d seconds
+
+ - 1 second left
+ - %d seconds left
-
- - 1 minute
- - %d minutes
+
+ - 1 minute left
+ - %d minutes left
-
+
- 1 hour
- - %d hours
+ - %d hours left
Warning
diff --git a/src/org/lineageos/updater/UpdatesListAdapter.java b/src/org/lineageos/updater/UpdatesListAdapter.java
index 621d473..957952a 100644
--- a/src/org/lineageos/updater/UpdatesListAdapter.java
+++ b/src/org/lineageos/updater/UpdatesListAdapter.java
@@ -133,7 +133,7 @@ public class UpdatesListAdapter extends RecyclerView.Adapter 0) {
- CharSequence etaString = StringGenerator.formatDuration(mActivity, eta * 1000);
+ CharSequence etaString = StringGenerator.formatETA(mActivity, eta * 1000);
viewHolder.mProgressText.setText(mActivity.getString(
R.string.list_download_progress_eta_new, downloaded, total, etaString,
percentage));
diff --git a/src/org/lineageos/updater/controller/UpdaterService.java b/src/org/lineageos/updater/controller/UpdaterService.java
index ad496ff..3966bb9 100644
--- a/src/org/lineageos/updater/controller/UpdaterService.java
+++ b/src/org/lineageos/updater/controller/UpdaterService.java
@@ -393,7 +393,7 @@ public class UpdaterService extends Service {
setNotificationTitle(update);
String speed = Formatter.formatFileSize(this, update.getSpeed());
- CharSequence eta = StringGenerator.formatDuration(this, update.getEta() * 1000);
+ CharSequence eta = StringGenerator.formatETA(this, update.getEta() * 1000);
mNotificationStyle.bigText(
getString(R.string.text_download_speed, eta, speed));
diff --git a/src/org/lineageos/updater/misc/StringGenerator.java b/src/org/lineageos/updater/misc/StringGenerator.java
index 712738a..fd11fce 100644
--- a/src/org/lineageos/updater/misc/StringGenerator.java
+++ b/src/org/lineageos/updater/misc/StringGenerator.java
@@ -67,20 +67,20 @@ public final class StringGenerator {
return String.format(getCurrentLocale(context), "%.0f", bytes / 1024.f / 1024.f);
}
- public static String formatDuration(Context context, long millis) {
+ public static String formatETA(Context context, long millis) {
final long SECOND_IN_MILLIS = 1000;
final long MINUTE_IN_MILLIS = SECOND_IN_MILLIS * 60;
final long HOUR_IN_MILLIS = MINUTE_IN_MILLIS * 60;
Resources res = context.getResources();
if (millis >= HOUR_IN_MILLIS) {
final int hours = (int) ((millis + 1800000) / HOUR_IN_MILLIS);
- return res.getQuantityString(R.plurals.duration_hours, hours, hours);
+ return res.getQuantityString(R.plurals.eta_hours, hours, hours);
} else if (millis >= MINUTE_IN_MILLIS) {
final int minutes = (int) ((millis + 30000) / MINUTE_IN_MILLIS);
- return res.getQuantityString(R.plurals.duration_minutes, minutes, minutes);
+ return res.getQuantityString(R.plurals.eta_minutes, minutes, minutes);
} else {
final int seconds = (int) ((millis + 500) / SECOND_IN_MILLIS);
- return res.getQuantityString(R.plurals.duration_seconds, seconds, seconds);
+ return res.getQuantityString(R.plurals.eta_seconds, seconds, seconds);
}
}