[automerger skipped] DO NOT MERGE - Skip SQ3A.220605.009 am: 3d94f60283 -s ours am: bcb345f844 -s ours
am skip reason: Merged-In I15af8dd9393974c5e397db2daede9e98a0b89ba4 with SHA-1 de3b7b7f4b is already in history
Original change: https://android-review.googlesource.com/c/platform/packages/providers/DownloadProvider/+/2128582
Change-Id: I39d2d9bbd704e9297f99fe87b97a3b0746b47097
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 43cf258..336b250 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -61,6 +61,7 @@
<uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
<uses-permission android:name="android.permission.MANAGE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
+ <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
<application android:process="android.process.media"
android:label="@string/app_label"
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 8138364..da877cf 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -41,7 +41,7 @@
<string name="wifi_recommended_body" msgid="8710820743211704403">"ਹੁਣ ਇਸ <xliff:g id="SIZE">%1$s </xliff:g> ਡਾਊਨਲੋਡ ਨੂੰ ਚਾਲੂ ਕਰਨ ਨਾਲ ਤੁਹਾਡੀ ਬੈਟਰੀ ਸਮਰੱਥਾ ਘੱਟ ਸਕਦੀ ਹੈ ਅਤੇ/ਜਾਂ ਇਸਦੇ ਸਿੱਟੇ ਵਜੋਂ ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਡਾਟਾ ਕਨੈਕਸ਼ਨ ਦੀ ਵਾਧੂ ਵਰਤੋਂ ਹੋ ਸਕਦੀ ਹੈ, ਜਿਸ ਨਾਲ ਤੁਹਾਡੇ ਡਾਟਾ ਪਲਾਨ ਦੇ ਆਧਾਰ ਤੇ ਤੁਹਾਡੇ ਮੋਬਾਈਲ ਓਪਰੇਟਰ ਵੱਲੋਂ ਖਰਚੇ ਪਾਏ ਜਾ ਸਕਦੇ ਹਨ।\n\n ਅਗਲੀ ਵਾਰ ਜਦੋਂ ਤੁਸੀਂ ਇੱਕ ਵਾਈ-ਫਾਈ ਨੈੱਟਵਰਕ ਨਾਲ ਕਨੈਕਟ ਕਰੋ ਤਾਂ ਇਸ ਡਾਊਨਲੋਡ ਨੂੰ ਚਾਲੂ ਕਰਨ ਲਈ <xliff:g id="QUEUE_TEXT">%2$s</xliff:g> ਨੂੰ ਸਪੱਰਸ਼ ਕਰੋ।"</string>
<string name="button_queue_for_wifi" msgid="6650185573566994738">"ਕਤਾਰ"</string>
<string name="button_cancel_download" msgid="4135046775536601831">"ਰੱਦ ਕਰੋ"</string>
- <string name="button_start_now" msgid="3817100969365441730">"ਹੁਣੇ ਸ਼ੁਰੂ ਕਰੋ"</string>
+ <string name="button_start_now" msgid="3817100969365441730">"ਹੁਣ ਚਾਲੂ ਕਰੋ"</string>
<plurals name="notif_summary_active" formatted="false" msgid="8652501374845637331">
<item quantity="one"><xliff:g id="NUMBER">%d</xliff:g> ਫ਼ਾਈਲਾਂ ਡਾਊਨਲੋਡ ਹੋ ਰਹੀਆਂ ਹਨ</item>
<item quantity="other"><xliff:g id="NUMBER">%d</xliff:g> ਫ਼ਾਈਲਾਂ ਡਾਊਨਲੋਡ ਹੋ ਰਹੀਆਂ ਹਨ</item>
diff --git a/src/com/android/providers/downloads/DownloadNotifier.java b/src/com/android/providers/downloads/DownloadNotifier.java
index 224aee4..3377432 100644
--- a/src/com/android/providers/downloads/DownloadNotifier.java
+++ b/src/com/android/providers/downloads/DownloadNotifier.java
@@ -287,7 +287,8 @@
}
// Calculate and show progress
- String remainingText = null;
+ String remainingLongText = null;
+ String remainingShortText = null;
String percentText = null;
if (type == TYPE_ACTIVE) {
long current = 0;
@@ -315,8 +316,10 @@
if (speed > 0) {
final long remainingMillis = ((total - current) * 1000) / speed;
- remainingText = res.getString(R.string.download_remaining,
- DateUtils.formatDuration(remainingMillis));
+ remainingLongText = getRemainingText(res, remainingMillis,
+ DateUtils.LENGTH_LONG);
+ remainingShortText = getRemainingText(res, remainingMillis,
+ DateUtils.LENGTH_SHORTEST);
}
final int percent = (int) ((current * 100) / total);
@@ -337,7 +340,7 @@
if (!TextUtils.isEmpty(description)) {
builder.setContentText(description);
} else {
- builder.setContentText(remainingText);
+ builder.setContentText(remainingLongText);
}
builder.setContentInfo(percentText);
@@ -368,9 +371,9 @@
if (type == TYPE_ACTIVE) {
builder.setContentTitle(res.getQuantityString(
R.plurals.notif_summary_active, cluster.size(), cluster.size()));
- builder.setContentText(remainingText);
+ builder.setContentText(remainingLongText);
builder.setContentInfo(percentText);
- inboxStyle.setSummaryText(remainingText);
+ inboxStyle.setSummaryText(remainingShortText);
} else if (type == TYPE_WAITING) {
builder.setContentTitle(res.getQuantityString(
@@ -399,6 +402,11 @@
}
}
+ private String getRemainingText(Resources res, long remainingMillis, int abbrev) {
+ return res.getString(R.string.download_remaining,
+ DateUtils.formatDuration(remainingMillis, abbrev));
+ }
+
private static CharSequence getDownloadTitle(Resources res, Cursor cursor) {
final String title = cursor.getString(UpdateQuery.TITLE);
if (!TextUtils.isEmpty(title)) {
diff --git a/src/com/android/providers/downloads/Helpers.java b/src/com/android/providers/downloads/Helpers.java
index 574b222..32e4dcc 100644
--- a/src/com/android/providers/downloads/Helpers.java
+++ b/src/com/android/providers/downloads/Helpers.java
@@ -171,9 +171,9 @@
new ComponentName(context, DownloadJobService.class));
// When this download will show a notification, run with a higher
- // priority, since it's effectively a foreground service
+ // bias, since it's effectively a foreground service
if (info.isVisible()) {
- builder.setPriority(JobInfo.PRIORITY_FOREGROUND_SERVICE);
+ builder.setBias(JobInfo.BIAS_FOREGROUND_SERVICE);
builder.setFlags(JobInfo.FLAG_WILL_BE_FOREGROUND);
}
