summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Android.bp4
-rw-r--r--AndroidManifest.xml3
-rw-r--r--jni/Android.bp5
-rw-r--r--jni/include/media_sizes.h7
-rw-r--r--jni/include/printer_capabilities_types.h10
-rw-r--r--jni/include/wprint_df_types.h1
-rw-r--r--jni/ipphelper/ipp_print.c4
-rw-r--r--jni/ipphelper/ipphelper.c235
-rw-r--r--jni/ipphelper/ipphelper.h3
-rw-r--r--jni/ipphelper/ippstatus_capabilities.c5
-rw-r--r--jni/lib/printable_area.c4
-rw-r--r--jni/lib/printer.c2
-rw-r--r--jni/plugins/genPCLm/src/genPCLm.cpp5
-rw-r--r--jni/plugins/media.h4
-rw-r--r--res/values-af/strings.xml4
-rw-r--r--res/values-am/strings.xml4
-rw-r--r--res/values-ar/strings.xml4
-rw-r--r--res/values-as/strings.xml4
-rw-r--r--res/values-az/strings.xml4
-rw-r--r--res/values-b+sr+Latn/strings.xml4
-rw-r--r--res/values-be/strings.xml4
-rw-r--r--res/values-bg/strings.xml4
-rw-r--r--res/values-bn/strings.xml4
-rw-r--r--res/values-bs/strings.xml4
-rw-r--r--res/values-ca/strings.xml4
-rw-r--r--res/values-cs/strings.xml4
-rw-r--r--res/values-da/strings.xml4
-rw-r--r--res/values-de/strings.xml4
-rw-r--r--res/values-el/strings.xml4
-rw-r--r--res/values-en-rAU/strings.xml4
-rw-r--r--res/values-en-rCA/strings.xml4
-rw-r--r--res/values-en-rGB/strings.xml4
-rw-r--r--res/values-en-rIN/strings.xml4
-rw-r--r--res/values-en-rXC/strings.xml4
-rw-r--r--res/values-es-rUS/strings.xml4
-rw-r--r--res/values-es/strings.xml4
-rw-r--r--res/values-et/strings.xml4
-rw-r--r--res/values-eu/strings.xml4
-rw-r--r--res/values-fa/strings.xml4
-rw-r--r--res/values-fi/strings.xml4
-rw-r--r--res/values-fr-rCA/strings.xml4
-rw-r--r--res/values-fr/strings.xml4
-rw-r--r--res/values-gl/strings.xml4
-rw-r--r--res/values-gu/strings.xml4
-rw-r--r--res/values-hi/strings.xml4
-rw-r--r--res/values-hr/strings.xml4
-rw-r--r--res/values-hu/strings.xml4
-rw-r--r--res/values-hy/strings.xml4
-rw-r--r--res/values-in/strings.xml4
-rw-r--r--res/values-is/strings.xml4
-rw-r--r--res/values-it/strings.xml4
-rw-r--r--res/values-iw/strings.xml4
-rw-r--r--res/values-ja/strings.xml4
-rw-r--r--res/values-ka/strings.xml4
-rw-r--r--res/values-kk/strings.xml4
-rw-r--r--res/values-km/strings.xml4
-rw-r--r--res/values-kn/strings.xml4
-rw-r--r--res/values-ko/strings.xml4
-rw-r--r--res/values-ky/strings.xml4
-rw-r--r--res/values-lo/strings.xml4
-rw-r--r--res/values-lt/strings.xml4
-rw-r--r--res/values-lv/strings.xml4
-rw-r--r--res/values-mk/strings.xml4
-rw-r--r--res/values-ml/strings.xml4
-rw-r--r--res/values-mn/strings.xml4
-rw-r--r--res/values-mr/strings.xml4
-rw-r--r--res/values-ms/strings.xml4
-rw-r--r--res/values-my/strings.xml4
-rw-r--r--res/values-nb/strings.xml4
-rw-r--r--res/values-ne/strings.xml4
-rw-r--r--res/values-nl/strings.xml4
-rw-r--r--res/values-or/strings.xml4
-rw-r--r--res/values-pa/strings.xml4
-rw-r--r--res/values-pl/strings.xml4
-rw-r--r--res/values-pt-rBR/strings.xml4
-rw-r--r--res/values-pt-rPT/strings.xml4
-rw-r--r--res/values-pt/strings.xml4
-rw-r--r--res/values-ro/strings.xml4
-rw-r--r--res/values-ru/strings.xml4
-rw-r--r--res/values-si/strings.xml4
-rw-r--r--res/values-sk/strings.xml4
-rw-r--r--res/values-sl/strings.xml4
-rw-r--r--res/values-sq/strings.xml4
-rw-r--r--res/values-sr/strings.xml4
-rw-r--r--res/values-sv/strings.xml4
-rw-r--r--res/values-sw/strings.xml4
-rw-r--r--res/values-ta/strings.xml4
-rw-r--r--res/values-te/strings.xml8
-rw-r--r--res/values-th/strings.xml4
-rw-r--r--res/values-tl/strings.xml4
-rw-r--r--res/values-tr/strings.xml4
-rw-r--r--res/values-uk/strings.xml4
-rw-r--r--res/values-ur/strings.xml4
-rw-r--r--res/values-uz/strings.xml4
-rw-r--r--res/values-vi/strings.xml4
-rw-r--r--res/values-zh-rCN/strings.xml4
-rw-r--r--res/values-zh-rHK/strings.xml4
-rw-r--r--res/values-zh-rTW/strings.xml4
-rw-r--r--res/values-zu/strings.xml4
-rw-r--r--res/values/strings.xml10
-rw-r--r--src/com/android/bips/BuiltInPrintService.java10
-rw-r--r--src/com/android/bips/ImagePrintActivity.java2
-rw-r--r--src/com/android/bips/LocalPrinter.java25
-rw-r--r--src/com/android/bips/P2pPermissionManager.java93
-rw-r--r--src/com/android/bips/ipp/StartJobTask.java18
-rw-r--r--src/com/android/bips/jni/MediaSizes.java42
-rw-r--r--src/com/android/bips/ui/AddPrintersFragment.java11
-rw-r--r--src/com/android/bips/ui/MoreOptionsActivity.java20
108 files changed, 787 insertions, 80 deletions
diff --git a/Android.bp b/Android.bp
index 1ef830f..4ffb195 100644
--- a/Android.bp
+++ b/Android.bp
@@ -12,6 +12,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
android_app {
name: "BuiltInPrintService",
privileged: true,
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 8b86b29..a16cf52 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -36,6 +36,7 @@
android:allowBackup="true"
android:supportsRtl="true">
<service android:name="com.android.bips.BuiltInPrintService"
+ android:exported="true"
android:permission="android.permission.BIND_PRINT_SERVICE">
<intent-filter>
<action android:name="android.printservice.PrintService" />
@@ -73,6 +74,7 @@
android:name="com.android.bips.ImagePrintActivity"
android:label="@string/print"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.SEND" />
@@ -85,6 +87,7 @@
android:name="com.android.bips.PdfPrintActivity"
android:label="@string/print"
android:theme="@android:style/Theme.Translucent.NoTitleBar"
+ android:exported="true"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter>
<action android:name="android.intent.action.SEND" />
diff --git a/jni/Android.bp b/jni/Android.bp
index d24e419..c25eb46 100644
--- a/jni/Android.bp
+++ b/jni/Android.bp
@@ -13,6 +13,10 @@
// See the License for the specific language governing permissions and
// limitations under the License.
+package {
+ default_applicable_licenses: ["Android-Apache-2.0"],
+}
+
cc_library_shared {
name: "libwfds",
@@ -58,6 +62,7 @@ cc_library_shared {
"plugins/wprint_scaler.c",
],
+ header_libs: ["jni_headers"],
local_include_dirs: [
"include",
"plugins/genPCLm/inc",
diff --git a/jni/include/media_sizes.h b/jni/include/media_sizes.h
index 66b0886..9fead93 100644
--- a/jni/include/media_sizes.h
+++ b/jni/include/media_sizes.h
@@ -141,6 +141,13 @@ typedef enum {
PHOTO_KG_SIZE_CARD = 124,
PHOTO_2E_SIZE_CARD = 125,
PHOTO_2L_SIZE_CARD = 126,
+ ARCH_A = 176,
+ ARCH_B = 177,
+ ARCH_C = 178,
+ ARCH_D = 179,
+ ARCH_E = 180,
+ ARCH_E1 = 181,
+ F_SIZE = 182,
/* Rotated Media (add 256 to the unrotated value) */
US_EXECUTIVE_ROTATED = 257,
diff --git a/jni/include/printer_capabilities_types.h b/jni/include/printer_capabilities_types.h
index 677f19c..90cb581 100644
--- a/jni/include/printer_capabilities_types.h
+++ b/jni/include/printer_capabilities_types.h
@@ -30,6 +30,16 @@
#include "wprint_df_types.h"
/*
+ * Media ready set definition
+ */
+typedef struct
+{
+ unsigned int x_dimension;
+ unsigned int y_dimension;
+ char media_tray_tag[MAX_STRING + 1];
+} media_ready_set_t;
+
+/*
* Printer Capabilities structure.
*/
typedef struct {
diff --git a/jni/include/wprint_df_types.h b/jni/include/wprint_df_types.h
index affe573..5f53990 100644
--- a/jni/include/wprint_df_types.h
+++ b/jni/include/wprint_df_types.h
@@ -60,6 +60,7 @@ typedef enum {
MEDIA_PRINTABLE_CD,
MEDIA_PREMIUM_PRESENTATION,
+ MEDIA_AUTO = 98,
MEDIA_UNKNOWN = 99 // New types above this line
} media_type_t;
diff --git a/jni/ipphelper/ipp_print.c b/jni/ipphelper/ipp_print.c
index 8ea4a20..785fd9a 100644
--- a/jni/ipphelper/ipp_print.c
+++ b/jni/ipphelper/ipp_print.c
@@ -352,6 +352,10 @@ static ipp_t *_fill_job(int ipp_op, char *printer_uri, const wprint_job_params_t
}
switch (job_params->media_type) {
+ case MEDIA_AUTO:
+ ippAddString(col[col_index], IPP_TAG_JOB, IPP_TAG_KEYWORD, "media-type", NULL,
+ "auto");
+ break;
case MEDIA_PHOTO_GLOSSY:
ippAddString(col[col_index], IPP_TAG_JOB, IPP_TAG_KEYWORD, "media-type", NULL,
"photographic-glossy");
diff --git a/jni/ipphelper/ipphelper.c b/jni/ipphelper/ipphelper.c
index 27a4090..11e9ad4 100644
--- a/jni/ipphelper/ipphelper.c
+++ b/jni/ipphelper/ipphelper.c
@@ -55,30 +55,75 @@ static void parse_printerUris(ipp_t *response, printer_capabilities_t *capabilit
* cases we override with a rounded-up value.
*/
struct MediaSizeTableElement SupportedMediaSizes[SUPPORTED_MEDIA_SIZE_COUNT] = {
- { US_LETTER, "LETTER", 8500, 11000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_letter_8.5x11in" },
- { US_LEGAL, "LEGAL", 8500, 14000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_legal_8.5x14in" },
- { LEDGER, "LEDGER", 11000, 17000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_ledger_11x17in" },
- { INDEX_CARD_5X7, "5X7", 5000, 7000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_5x7_5x7in" },
+ { US_LETTER, "LETTER", 8500, 11000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_letter_8.5x11in",
+ 215900, 279400 },
+ { US_LEGAL, "LEGAL", 8500, 14000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_legal_8.5x14in",
+ 215900, 355600 },
+ { LEDGER, "LEDGER", 11000, 17000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_ledger_11x17in",
+ 279400, 431800 },
+ { INDEX_CARD_5X7, "5X7", 5000, 7000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_5x7_5x7in",
+ 127000, 177800 },
// Android system uses width of 11690
- { ISO_A3, "A3", 11694, 16540, 297, 420, "iso_a3_297x420mm" },
+ { ISO_A3, "A3", 11694, 16540, 297, 420, "iso_a3_297x420mm",
+ 297000, 420000 },
// Android system uses width of 8267
- { ISO_A4, "A4", 8268, 11692, 210, 297, "iso_a4_210x297mm" },
- { ISO_A5, "A5", 5830, 8270, 148, 210, "iso_a5_148x210mm" },
+ { ISO_A4, "A4", 8268, 11692, 210, 297, "iso_a4_210x297mm",
+ 210000, 297000 },
+ { ISO_A5, "A5", 5830, 8270, 148, 210, "iso_a5_148x210mm",
+ 148000, 210000 },
// Android system uses width of 10118
- { JIS_B4, "JIS B4", 10119, 14331, 257, 364, "jis_b4_257x364mm" },
+ { JIS_B4, "JIS B4", 10119, 14331, 257, 364, "jis_b4_257x364mm",
+ 257000, 364000 },
// Android system uses width of 7165
- { JIS_B5, "JIS B5", 7167, 10118, 182, 257, "jis_b5_182x257mm" },
+ { JIS_B5, "JIS B5", 7167, 10118, 182, 257, "jis_b5_182x257mm",
+ 182000, 257000 },
{ US_GOVERNMENT_LETTER, "8x10", 8000, 10000, UNKNOWN_VALUE, UNKNOWN_VALUE,
- "na_govt-letter_8x10in" },
- { INDEX_CARD_4X6, "4x6", 4000, 6000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_index-4x6_4x6in" },
- { JPN_HAGAKI_PC, "JPOST", 3940, 5830, 100, 148, "jpn_hagaki_100x148mm" },
- { PHOTO_89X119, "89X119", 3504, 4685, 89, 119, "om_dsc-photo_89x119mm" },
- { CARD_54X86, "54X86", 2126, 3386, 54, 86, "om_card_54x86mm" },
- { OE_PHOTO_L, "L", 3500, 5000, UNKNOWN_VALUE, UNKNOWN_VALUE, "oe_photo-l_3.5x5in" }
+ "na_govt-letter_8x10in",203200, 254000 },
+ { INDEX_CARD_4X6, "4x6", 4000, 6000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_index-4x6_4x6in",
+ 101600, 152400 },
+ { JPN_HAGAKI_PC, "JPOST", 3940, 5830, 100, 148, "jpn_hagaki_100x148mm",
+ 100000, 148000 },
+ { PHOTO_89X119, "89X119", 3504, 4685, 89, 119, "om_dsc-photo_89x119mm",
+ 89000, 119000 },
+ { CARD_54X86, "54X86", 2126, 3386, 54, 86, "om_card_54x86mm",
+ 54000, 86000 },
+ { OE_PHOTO_L, "L", 3500, 5000, UNKNOWN_VALUE, UNKNOWN_VALUE, "oe_photo-l_3.5x5in",
+ 88900, 127000 },
+
+ // Large formats
+ { ISO_AND_JIS_A0, "A0", 33110, 46810, 841, 1189, "iso_a0_841x1189mm",
+ 841000, 1189000},
+ { ISO_AND_JIS_A1, "A1", 23390, 33110, 594, 841, "iso_a1_594x841mm",
+ 594000, 841000},
+ { ISO_AND_JIS_A2, "A2", 16540, 23390, 420, 594, "iso_a2_420x594mm",
+ 420000, 594000},
+ { ARCH_A, "9X12", 9000, 12000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_arch-a_9x12in",
+ 228600, 304800},
+ { ARCH_B, "12X18", 12000, 18000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_arch-b_12x18in",
+ 304800, 457200},
+ { ARCH_C, "18x24", 18000, 24000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_arch-c_18x24in",
+ 457200, 609600},
+ { ARCH_D, "24x36", 24000, 36000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_arch-d_24x36in",
+ 609600, 914400},
+ { ARCH_E, "36x48", 36000, 48000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_arch-e_36x48in",
+ 914400, 1219200},
+ { ARCH_E1, "30x42", 30000, 42000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_wide-format_30x42in",
+ 762000, 1066800},
+ { C_SIZE, "AnsiC", 17000, 22000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_c_17x22in",
+ 431800, 558800},
+ { D_SIZE, "AnsiD", 22000, 34000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_d_22x34in",
+ 558800, 863600},
+ { E_SIZE, "AnsiE", 34000, 44000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_e_34x44in",
+ 863600, 1117600},
+ { F_SIZE, "AnsiF", 28000, 40000, UNKNOWN_VALUE, UNKNOWN_VALUE, "asme_f_28x40in",
+ 711200, 1016000},
+ { SUPER_B, "SuperB", 13000, 19000, UNKNOWN_VALUE, UNKNOWN_VALUE, "na_super-b_13x19in",
+ 330200, 482600}
+
};
typedef struct {
@@ -630,16 +675,150 @@ int ipp_find_media_size(const char *ipp_media_keyword, media_size_t *media_size)
return -1;
}
-void parse_getMediaSupported(ipp_t *response, media_supported_t *media_supported) {
+static int getMediaSizeFromTag(const char *media_size_tag, media_size_t *media_size) {
+ int i;
+ LOGD("find media size from tag %s", media_size_tag);
+ for (i = 0; i < SUPPORTED_MEDIA_SIZE_COUNT; i++) {
+ if (strcmp(SupportedMediaSizes[i].PWGName, media_size_tag) == 0) {
+ LOGD("Media size match: pwg name %s", SupportedMediaSizes[i].PWGName);
+ *media_size = SupportedMediaSizes[i].media_size;
+ return i;
+ }
+ }
+ return -1;
+}
+
+static int getMediaSizeNameFromDimens(
+ unsigned int mediaColReadyWidth,
+ unsigned int mediaColReadyHeight,
+ media_size_t *media_size) {
+ int i;
+ for (i = 0; i < SUPPORTED_MEDIA_SIZE_COUNT; i++) {
+ if (SupportedMediaSizes[i].WidthInMicrometers / 10 == mediaColReadyWidth
+ && SupportedMediaSizes[i].HeightInMicrometers / 10 == mediaColReadyHeight) {
+ *media_size = SupportedMediaSizes[i].media_size;
+ return i;
+ }
+ }
+ return -1;
+}
+
+static void addMediaIfNotDuplicate(
+ int idx,
+ int *sizes_idx,
+ media_supported_t *media_supported,
+ media_size_t media_size) {
+ if (idx >= 0) {
+ // Check if we've already added this media size to the supported list
+ bool isDuplicate = false;
+ for (int j = 0; j < (*sizes_idx); j++) {
+ if (media_supported->idxKeywordTranTable[j] == idx) {
+ isDuplicate = true;
+ break;
+ }
+ }
+ // Only add if it hasn't been added yet
+ if (!isDuplicate) {
+ media_supported->media_size[(*sizes_idx)] = media_size;
+ media_supported->idxKeywordTranTable[(*sizes_idx)] = idx;
+ (*sizes_idx)++;
+ }
+ }
+}
+
+static void addRollSupportedSizes(
+ unsigned int width,
+ unsigned int minHeight,
+ unsigned int maxHeight,
+ media_supported_t *media_supported,
+ int *sizesIdx) {
+ // If a supported media size fits on the roll size, add it to the list
+ for (int i = 0; i < SUPPORTED_MEDIA_SIZE_COUNT; i++) {
+ if(SupportedMediaSizes[i].WidthInMicrometers / 10 <= width
+ && SupportedMediaSizes[i].HeightInMicrometers / 10 >= minHeight
+ && SupportedMediaSizes[i].HeightInMicrometers / 10 <= maxHeight) {
+ addMediaIfNotDuplicate(i, sizesIdx, media_supported, SupportedMediaSizes[i].media_size);
+ }
+ }
+}
+
+void parse_getMediaSupported(
+ ipp_t *response,
+ media_supported_t *media_supported,
+ printer_capabilities_t *capabilities) {
int i;
- ipp_attribute_t *attrptr;
int sizes_idx = 0;
LOGD(" Entered getMediaSupported");
media_size_t media_sizeTemp;
int idx = 0;
- if ((attrptr = ippFindAttribute(response, "media-supported", IPP_TAG_KEYWORD)) != NULL) {
+ // Check for media-col-ready first
+ ipp_attribute_t *attrptr;
+ if((attrptr =
+ ippFindAttribute(response, "media-col-ready", IPP_TAG_BEGIN_COLLECTION)) != NULL) {
+ LOGD("media-col-ready found");
+ for (i = 0; i < ippGetCount(attrptr); i++) {
+ ipp_t *collection = ippGetCollection(attrptr, i);
+ ipp_attribute_t *attrptr2;
+ media_ready_set_t mediaReadySet = {};
+ int minHeight = 0, maxHeight = 0;
+ for (attrptr2 = ippFirstAttribute(collection);
+ (attrptr2 != NULL);
+ attrptr2 = ippNextAttribute(collection)) {
+ if (strcmp("media-size", ippGetName(attrptr2)) == 0) {
+ ipp_t *collection_sec = ippGetCollection(attrptr2, 0);
+ ipp_attribute_t *attrptr3;
+ for (attrptr3 = ippFirstAttribute(collection_sec);
+ (attrptr3 != NULL);
+ attrptr3 = ippNextAttribute(collection_sec)) {
+ if (strcmp("x-dimension", ippGetName(attrptr3)) == 0) {
+ mediaReadySet.x_dimension = ippGetInteger(attrptr3, 0);
+ } else if (strcmp("y-dimension", ippGetName(attrptr3)) == 0) {
+ if (ippGetValueTag(attrptr3) == IPP_TAG_RANGE) {
+ minHeight = ippGetRange(attrptr3, 0, &maxHeight);
+ mediaReadySet.y_dimension = minHeight;
+ } else if (ippGetValueTag(attrptr3) == IPP_TAG_INTEGER) {
+ mediaReadySet.y_dimension = ippGetInteger(attrptr3, 0);
+ }
+ }
+ }
+ } else if (strcmp("media-source", ippGetName(attrptr2)) == 0) {
+ memset(mediaReadySet.media_tray_tag, 0, MAX_STRING + 1);
+ strncpy(mediaReadySet.media_tray_tag,
+ ippGetString(attrptr2, 0, NULL), MAX_STRING);
+ }
+ }
+ if (minHeight > 0 && maxHeight > 0
+ && strstr(mediaReadySet.media_tray_tag, "roll") != NULL) {
+ // If the source is a roll, add supported sizes that would fit on the roll
+ addRollSupportedSizes(mediaReadySet.x_dimension, minHeight, maxHeight,
+ media_supported, &sizes_idx);
+ } else {
+ // Get the media size name from x and y dimensions
+ idx = getMediaSizeNameFromDimens(mediaReadySet.x_dimension,
+ mediaReadySet.y_dimension,
+ &media_sizeTemp);
+ addMediaIfNotDuplicate(idx, &sizes_idx, media_supported, media_sizeTemp);
+ }
+ }
+ }
+ // Check media-ready if no supported media was found in media-col-ready
+ if (sizes_idx == 0
+ && (attrptr = ippFindAttribute(response, "media-ready", IPP_TAG_KEYWORD)) != NULL) {
+ LOGD("media-ready found");
+ for (i = 0; i < ippGetCount(attrptr); i++) {
+ char media_size_tag[MAX_STRING + 1];
+ memset(media_size_tag, 0, MAX_STRING + 1);
+ strncpy(media_size_tag,
+ ippGetString(attrptr, i, NULL), MAX_STRING);
+ idx = getMediaSizeFromTag(media_size_tag, &media_sizeTemp);
+ addMediaIfNotDuplicate(idx, &sizes_idx, media_supported, media_sizeTemp);
+ }
+ }
+ // If there was nothing in media-ready or media-col-ready, check media-supported
+ if (sizes_idx == 0
+ && ((attrptr = ippFindAttribute(response, "media-supported", IPP_TAG_KEYWORD)) != NULL)) {
LOGD("media-supported found; number of values %d", ippGetCount(attrptr));
for (i = 0; i < ippGetCount(attrptr); i++) {
idx = ipp_find_media_size(ippGetString(attrptr, i, NULL), &media_sizeTemp);
@@ -652,8 +831,9 @@ void parse_getMediaSupported(ipp_t *response, media_supported_t *media_supported
sizes_idx++;
}
}
- } else {
- LOGD("media-supported not found");
+ }
+ if (sizes_idx == 0) {
+ LOGD("No supported media found");
}
}
@@ -711,7 +891,7 @@ void parse_printerAttributes(ipp_t *response, printer_capabilities_t *capabiliti
for (i = 0; i <= PAGE_STATUS_MAX - 1; i++) {
media_supported.media_size[i] = 0;
}
- parse_getMediaSupported(response, &media_supported);
+ parse_getMediaSupported(response, &media_supported, capabilities);
parse_printerUris(response, capabilities);
@@ -838,6 +1018,8 @@ void parse_printerAttributes(ipp_t *response, printer_capabilities_t *capabiliti
addMediaType(capabilities, MEDIA_PHOTO);
} else if (strcasestr(ippGetString(attrptr, i, NULL), "stationery")) {
addMediaType(capabilities, MEDIA_PLAIN);
+ } else if (strcasestr(ippGetString(attrptr, i, NULL), "auto")) {
+ addMediaType(capabilities, MEDIA_AUTO);
}
}
}
@@ -1051,6 +1233,15 @@ void parse_printerAttributes(ipp_t *response, printer_capabilities_t *capabiliti
capabilities->faceDownTray = 0;
}
}
+ if ((attrptr = ippFindAttribute(response, "printer-output-tray", IPP_TAG_STRING)) != NULL) {
+ for (i = 0; i < ippGetCount(attrptr); i++) {
+ int length = 0;
+ const char *tray_str = ippGetOctetString(attrptr, i, &length);
+ if (strstr(tray_str, "faceUp") != NULL) {
+ capabilities->faceDownTray = 0;
+ }
+ }
+ }
// Determine supported document format details
if ((attrptr = ippFindAttribute(response, "document-format-details-supported",
@@ -1175,7 +1366,7 @@ static int ipp_server_cert_cb(http_t *http, void *tls, cups_array_t *certs, void
if (connect_info->validate_certificate) {
http_credential_t *credential = cupsArrayFirst(certs);
if (credential) {
- LOGD("ipp_server_cert_cb: validate_certificate (len=%d)", credential->datalen);
+ LOGD("ipp_server_cert_cb: validate_certificate (len=%zu)", credential->datalen);
error = connect_info->validate_certificate(connect_info, credential->data, credential->datalen);
}
}
diff --git a/jni/ipphelper/ipphelper.h b/jni/ipphelper/ipphelper.h
index 2219fe8..bd93741 100644
--- a/jni/ipphelper/ipphelper.h
+++ b/jni/ipphelper/ipphelper.h
@@ -97,7 +97,8 @@ extern status_t set_ipp_version(ipp_t *, char *, http_t *, ipp_version_state);
/*
* Parses supported media from the IPP response and copies the list into capabilities
*/
-extern void parse_getMediaSupported(ipp_t *response, media_supported_t *media_supported);
+extern void parse_getMediaSupported(ipp_t *response, media_supported_t *media_supported,
+ printer_capabilities_t *capabilities);
/*
* Logs printer capabilities
diff --git a/jni/ipphelper/ippstatus_capabilities.c b/jni/ipphelper/ippstatus_capabilities.c
index 9c596cb..6bd821f 100644
--- a/jni/ipphelper/ippstatus_capabilities.c
+++ b/jni/ipphelper/ippstatus_capabilities.c
@@ -56,6 +56,7 @@ static const char *pattrs[] = {
"output-bin-supported",
"print-color-mode-supported",
"print-quality-supported",
+ "printer-output-tray",
"printer-resolution-supported",
"sides-supported",
"printer-device-id",
@@ -65,7 +66,9 @@ static const char *pattrs[] = {
"pclm-compression-method-preferred",
"pclm-source-resolution-supported",
"pwg-raster-document-sheet-back",
- "document-format-details-supported"
+ "document-format-details-supported",
+ "media-ready",
+ "media-col-ready"
};
static void _init(const ifc_printer_capabilities_t *this_p,
diff --git a/jni/lib/printable_area.c b/jni/lib/printable_area.c
index 358bd95..ee6781b 100644
--- a/jni/lib/printable_area.c
+++ b/jni/lib/printable_area.c
@@ -41,10 +41,10 @@ void printable_area_get(wprint_job_params_t *job_params, float top_margin, float
job_params->page_height = SupportedMediaSizes[i].HeightInInches / 1000;
}
}
- // don't adjust for margins if job is borderless and PCLm. dimensions of image will not
+ // don't adjust for margins if job is PCLm. dimensions of image will not
// match (will be bigger than) the dimensions of the page size and a corrupt image will render
// in genPCLm
- if (job_params->borderless && job_params->pcl_type == PCLm) {
+ if (job_params->pcl_type == PCLm) {
job_params->printable_area_width = (unsigned int) _MI_TO_PIXELS(
job_params->page_width * 1000, job_params->pixel_units);
job_params->printable_area_height = (unsigned int) _MI_TO_PIXELS(
diff --git a/jni/lib/printer.c b/jni/lib/printer.c
index 55eca67..99aadf4 100644
--- a/jni/lib/printer.c
+++ b/jni/lib/printer.c
@@ -122,7 +122,7 @@ static int _send_data(const ifc_print_job_t *this_p, const char *buffer, size_t
if (FD_ISSET(print_job->psock, &w_fds)) {
bytes_written = write(print_job->psock, buffer, length);
if (bytes_written < 0) {
- LOGE("unable to transmit %d bytes of data (errno %d)", length, errno);
+ LOGE("unable to transmit %zu bytes of data (errno %d)", length, errno);
retval = ERROR;
} else {
length -= bytes_written;
diff --git a/jni/plugins/genPCLm/src/genPCLm.cpp b/jni/plugins/genPCLm/src/genPCLm.cpp
index 0aab701..a9a6ac4 100644
--- a/jni/plugins/genPCLm/src/genPCLm.cpp
+++ b/jni/plugins/genPCLm/src/genPCLm.cpp
@@ -60,9 +60,8 @@ static ubyte *shiftStripByLeftMargin(ubyte *ptrToStrip, sint32 currSourceWidth,
if (destColorSpace == grayScale) {
scanLineWidth = currMediaWidth;
-
// Allocate a full strip
- newStrip = (ubyte *) malloc(scanLineWidth * currStripHeight);
+ newStrip = (ubyte *) malloc((scanLineWidth * currStripHeight) + leftMargin);
memset(newStrip, 0xff, scanLineWidth * currStripHeight);
for (int i = 0; i < numLinesThisCall; i++) {
toPtr = newStrip + leftMargin + (i * currMediaWidth);
@@ -73,7 +72,7 @@ static ubyte *shiftStripByLeftMargin(ubyte *ptrToStrip, sint32 currSourceWidth,
scanLineWidth = currMediaWidth * 3;
sint32 srcScanlineWidth = currSourceWidth * 3;
sint32 shiftAmount = leftMargin * 3;
- newStrip = (ubyte *) malloc(scanLineWidth * currStripHeight);
+ newStrip = (ubyte *) malloc((scanLineWidth * currStripHeight) + shiftAmount);
memset(newStrip, 0xff, scanLineWidth * currStripHeight);
for (int i = 0; i < numLinesThisCall; i++) {
toPtr = newStrip + shiftAmount + (i * scanLineWidth);
diff --git a/jni/plugins/media.h b/jni/plugins/media.h
index 87a478e..b49a43e 100644
--- a/jni/plugins/media.h
+++ b/jni/plugins/media.h
@@ -35,9 +35,11 @@ struct MediaSizeTableElement {
const float WidthInMm; // Width in mm for metric based media sizes or UNKNOWN_VALUE otherwise
const float HeightInMm; // Height in mm for metric based media sizes or UNKNOWN_VALUE otherwise
const char *PWGName;
+ const unsigned int WidthInMicrometers;
+ const unsigned int HeightInMicrometers;
};
-#define SUPPORTED_MEDIA_SIZE_COUNT 15
+#define SUPPORTED_MEDIA_SIZE_COUNT 29
extern struct MediaSizeTableElement SupportedMediaSizes[SUPPORTED_MEDIA_SIZE_COUNT];
#endif // __MEDIA_H__ \ No newline at end of file
diff --git a/res/values-af/strings.xml b/res/values-af/strings.xml
index 554430b..b6cab20 100644
--- a/res/values-af/strings.xml
+++ b/res/values-af/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Aanvaar"</string>
<string name="reject" msgid="24751635160440693">"Weier"</string>
<string name="connections" msgid="8895413761760117180">"Verbindings"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Verstekdrukdiens kan nie Wi-Fi Direct-drukkers vind nie"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Deaktiveer Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Verstekdrukdiens het liggingtoestemming nodig om toestelle in die omtrek te vind."</string>
<string name="fix" msgid="7784394272611365393">"Gaan toestemming na"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Liggingdienste moet geaktiveer wees sodat Verstekdrukdiens toestelle in die omtrek kan vind."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Aktiveer ligging"</string>
<string name="print" msgid="7851318072404916362">"Druk"</string>
</resources>
diff --git a/res/values-am/strings.xml b/res/values-am/strings.xml
index 780df99..27bc50e 100644
--- a/res/values-am/strings.xml
+++ b/res/values-am/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"ተቀበል"</string>
<string name="reject" msgid="24751635160440693">"አትቀበል"</string>
<string name="connections" msgid="8895413761760117180">"ግንኙነቶች"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"ነባሪ የህትመት አገልግሎት የWi-Fi ቀጥታ አታሚዎችን ማግኘት አይችልም"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi ቀጥታ አገናኝን ያሰናክሉ"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"ነባሪ የህትመት አገልግሎት በአቅራቢያ ያሉ መሣሪያዎችን ለማግኘት የአካባቢ ፈቃድ ያስፈልገዋል።"</string>
<string name="fix" msgid="7784394272611365393">"ፈቃድን ይገምግሙ"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"ነባሪ የህትመት አገልግሎት በአቅራቢያ ያሉ መሣሪያዎችን ለማግኘት የነቁ የአካባቢ አገልግሎቶች ያስፈልጋሉ።"</string>
+ <string name="enable_location" msgid="3627841004298863140">"አካባቢን ያንቁ"</string>
<string name="print" msgid="7851318072404916362">"አትም"</string>
</resources>
diff --git a/res/values-ar/strings.xml b/res/values-ar/strings.xml
index 575fb0f..da863dc 100644
--- a/res/values-ar/strings.xml
+++ b/res/values-ar/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"موافقة"</string>
<string name="reject" msgid="24751635160440693">"رفض"</string>
<string name="connections" msgid="8895413761760117180">"الاتصالات"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"‏يتعذّر على \"خدمة الطباعة التلقائية\" العثور على الطابعات التي تعمل بتقنية اتصال Wi-Fi المباشر\"."</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"‏إيقاف اتصال Wi-Fi المباشر"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"تحتاج \"خدمة الطباعة التلقائية\" إلى إذن تحديد الموقع الجغرافي للعثور على الأجهزة المجاورة."</string>
<string name="fix" msgid="7784394272611365393">"مراجعة الإذن"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"يجب تفعيل خدمات الموقع الحغرافي لتتمكن \"خدمة الطباعة التلقائية\" من العثور على الأجهزة القريبة."</string>
+ <string name="enable_location" msgid="3627841004298863140">"تفعيل الموقع الجرافي"</string>
<string name="print" msgid="7851318072404916362">"طباعة"</string>
</resources>
diff --git a/res/values-as/strings.xml b/res/values-as/strings.xml
index 85547bd..15222bf 100644
--- a/res/values-as/strings.xml
+++ b/res/values-as/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"গ্ৰহণ কৰক"</string>
<string name="reject" msgid="24751635160440693">"প্ৰত্যাখ্যান কৰক"</string>
<string name="connections" msgid="8895413761760117180">"সংযোগসমূহ"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"ডিফ’ল্ট প্ৰিণ্ট সেৱাই ৱাই-ফাই ডাইৰেক্ট প্ৰিণ্টাৰ বিচাৰি পোৱা নাই"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"ৱাই-ফাই ডাইৰেক্ট অক্ষম কৰক"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"ডিফ\'ল্ট প্ৰিণ্ট সেৱাক নিকটৱৰ্তী ডিভাইচসমূহ বিচাৰিবলৈ অৱস্থানৰ অনুমতিৰ আৱশ্যক।"</string>
<string name="fix" msgid="7784394272611365393">"পর্যালোচনাৰ অনুমতি"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"নিকটৱৰ্তী ডিভাইচ বিচাৰিবলৈ ডিফ’ল্ট প্ৰিণ্ট সেৱাৰ বাবে অৱস্থান সেৱা সক্ষম হৈ থকাৰ আৱশ্যক।"</string>
+ <string name="enable_location" msgid="3627841004298863140">"অৱস্থান সক্ষম কৰক"</string>
<string name="print" msgid="7851318072404916362">"প্ৰিণ্ট কৰক"</string>
</resources>
diff --git a/res/values-az/strings.xml b/res/values-az/strings.xml
index 63cfbdf..7cc6945 100644
--- a/res/values-az/strings.xml
+++ b/res/values-az/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Qəbul edin"</string>
<string name="reject" msgid="24751635160440693">"Rədd edin"</string>
<string name="connections" msgid="8895413761760117180">"Əlaqələr"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Standart çap xidməti Wi-Fi Direct printerini tapa bilmir"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direkt\'i deaktiv edin"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Standart çap xidmətinə cihazları tapmaq üçün məkan icazəsi lazımdır."</string>
<string name="fix" msgid="7784394272611365393">"Rəy icazələri"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Standart çap xidmətinə cihazları tapmaq üçün məkan aşkarlanmasının açıq olması lazımdır."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Məkanı aktivləşdirin"</string>
<string name="print" msgid="7851318072404916362">"Çap"</string>
</resources>
diff --git a/res/values-b+sr+Latn/strings.xml b/res/values-b+sr+Latn/strings.xml
index 455f13b..d593abe 100644
--- a/res/values-b+sr+Latn/strings.xml
+++ b/res/values-b+sr+Latn/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Prihvati"</string>
<string name="reject" msgid="24751635160440693">"Odbij"</string>
<string name="connections" msgid="8895413761760117180">"Veze"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Usluga podrazumevanog štampanja nije uspela da pronađe WiFi Direct štampače"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Ugasi WiFi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Usluzi podrazumevanog štampanja treba dozvola za lokaciju da bi pronašla uređaje u blizini."</string>
<string name="fix" msgid="7784394272611365393">"Prikaži dozvolu"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Usluzi podrazumevanog štampanja zahteva omogućene usluge lokacije radi pronalaženja uređaja u blizini."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Omogući lokaciju"</string>
<string name="print" msgid="7851318072404916362">"Odštampaj"</string>
</resources>
diff --git a/res/values-be/strings.xml b/res/values-be/strings.xml
index 84e4c0c..d8b9766 100644
--- a/res/values-be/strings.xml
+++ b/res/values-be/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Прыняць"</string>
<string name="reject" msgid="24751635160440693">"Адхіліць"</string>
<string name="connections" msgid="8895413761760117180">"Падключэнні"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Стандартны сэрвіс друку не можа знайсці прынтары Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Спыніць Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Каб знаходзіць прылады паблізу, стандартнаму сэрвісу друку патрабуюцца дазволы на доступ да даных пра месцазнаходжанне."</string>
<string name="fix" msgid="7784394272611365393">"Праглядзець дазвол"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Каб знаходзіць прылады паблізу, стандартнаму сэрвісу друку патрабуюцца службы геалакацыі."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Уключыць геалакацыю"</string>
<string name="print" msgid="7851318072404916362">"Друк"</string>
</resources>
diff --git a/res/values-bg/strings.xml b/res/values-bg/strings.xml
index 4209277..18c98a1 100644
--- a/res/values-bg/strings.xml
+++ b/res/values-bg/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Приемам"</string>
<string name="reject" msgid="24751635160440693">"Отхвърляне"</string>
<string name="connections" msgid="8895413761760117180">"Връзки"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Стандартната услуга за отпечатване не може да открие принтери с Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct: Деакт."</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Стандартната услуга за отпечатване се нуждае от разрешение за достъп до местоположението, за да намира устройствата в близост."</string>
<string name="fix" msgid="7784394272611365393">"Разрешение: Преглед"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"За да може стандартната услуга за отпечатване да намира устройствата в близост, услугите за местоположение трябва да са активирани."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Местопол.: Активир."</string>
<string name="print" msgid="7851318072404916362">"Отпечатване"</string>
</resources>
diff --git a/res/values-bn/strings.xml b/res/values-bn/strings.xml
index 6fe5c23..21648af 100644
--- a/res/values-bn/strings.xml
+++ b/res/values-bn/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"গ্রহণ করুন"</string>
<string name="reject" msgid="24751635160440693">"বাতিল করুন"</string>
<string name="connections" msgid="8895413761760117180">"কানেকশন"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"ডিফল্ট প্রিন্ট পরিষেবা Wi-Fi ডাইরেক্ট প্রিন্টার খুঁজে পাচ্ছে না"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi ডাইরেক্ট বন্ধ করুন"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"আশেপাশের ডিভাইস খোঁজার জন্য ডিফল্ট প্রিন্ট পরিষেবাকে লোকেশন অ্যাক্সেসের অনুমতি দিতে হবে।"</string>
<string name="fix" msgid="7784394272611365393">"রিভিউ করার অনুমতি"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"ডিফল্ট প্রিন্ট পরিষেবার আশেপাশের ডিভাইস খুঁজে পেতে লোকেশন পরিষেবা চালু থাকতে হবে।"</string>
+ <string name="enable_location" msgid="3627841004298863140">"লোকেশন চালু করুন"</string>
<string name="print" msgid="7851318072404916362">"প্রিন্ট করুন"</string>
</resources>
diff --git a/res/values-bs/strings.xml b/res/values-bs/strings.xml
index 30a29e5..dee0962 100644
--- a/res/values-bs/strings.xml
+++ b/res/values-bs/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Prihvati"</string>
<string name="reject" msgid="24751635160440693">"Odbij"</string>
<string name="connections" msgid="8895413761760117180">"Veze"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Zadana usluga štampanja ne može pronaći štampače s opcijom Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Onemog. Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Zadanoj usluzi štampanja je potrebno odobrenje za lokaciju da pronađe uređaje u blizini."</string>
<string name="fix" msgid="7784394272611365393">"Pregledaj odobrenje"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Zadanoj usluzi štampanja je potrebno da omogućite usluge lokacije radi pronalaska uređaja u blizini."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Omogući lokaciju"</string>
<string name="print" msgid="7851318072404916362">"Štampaj"</string>
</resources>
diff --git a/res/values-ca/strings.xml b/res/values-ca/strings.xml
index 2d5fb1f..55b935b 100644
--- a/res/values-ca/strings.xml
+++ b/res/values-ca/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Accepta"</string>
<string name="reject" msgid="24751635160440693">"Rebutja"</string>
<string name="connections" msgid="8895413761760117180">"Connexions"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"El servei d\'impressió predeterminat no troba impressores Wi‑Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Desact. Wi‑Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"El servei d\'impressió predeterminat necessita permisos d\'ubicació per trobar dispositius propers."</string>
<string name="fix" msgid="7784394272611365393">"Revisa els permisos"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"El servei d\'impressió predeterminat necessita que els serveis d\'ubicació estiguin activats per trobar dispositius propers."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Activa la ubicació"</string>
<string name="print" msgid="7851318072404916362">"Imprimeix"</string>
</resources>
diff --git a/res/values-cs/strings.xml b/res/values-cs/strings.xml
index 7f34f6a..a8c8808 100644
--- a/res/values-cs/strings.xml
+++ b/res/values-cs/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Přijmout"</string>
<string name="reject" msgid="24751635160440693">"Odmítnout"</string>
<string name="connections" msgid="8895413761760117180">"Připojení"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Výchozí tisková služba nedokáže najít tiskárny s Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Vypnout Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Služba výchozího tisku potřebuje oprávnění pro přístup k poloze, aby mohla vyhledat zařízení v okolí."</string>
<string name="fix" msgid="7784394272611365393">"Kontrola oprávnění"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Služba výchozího tisku potřebuje služby určování polohy, aby mohla vyhledat zařízení v okolí."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Povolit polohu"</string>
<string name="print" msgid="7851318072404916362">"Tisk"</string>
</resources>
diff --git a/res/values-da/strings.xml b/res/values-da/strings.xml
index 477cf9d..03300c5 100644
--- a/res/values-da/strings.xml
+++ b/res/values-da/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Acceptér"</string>
<string name="reject" msgid="24751635160440693">"Afvis"</string>
<string name="connections" msgid="8895413761760117180">"Forbindelser"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Standardtjenesten til udskrivning kan ikke finde printere med Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Deaktiver Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Standardtjenesten til udskrivning skal have adgangstilladelse til din lokation for at finde enheder i nærheden."</string>
<string name="fix" msgid="7784394272611365393">"Gennemgå tilladelsen"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Lokationstjenester skal være aktiveret, før standardtjenesten til udskrivning kan finde enheder i nærheden."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Aktivér Lokation"</string>
<string name="print" msgid="7851318072404916362">"Udskriv"</string>
</resources>
diff --git a/res/values-de/strings.xml b/res/values-de/strings.xml
index 9344453..aee2608 100644
--- a/res/values-de/strings.xml
+++ b/res/values-de/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Akzeptieren"</string>
<string name="reject" msgid="24751635160440693">"Ablehnen"</string>
<string name="connections" msgid="8895413761760117180">"Verbindungen"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Der Standarddruckdienst kann keine Wi-Fi Direct-Drucker finden"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct deaktivieren"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Der Standarddruckdienst erfordert eine Berechtigung zur Standortermittlung, um Geräte in der Nähe zu finden."</string>
<string name="fix" msgid="7784394272611365393">"Berechtigung prüfen"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Für den Standarddruckdienst müssen die Standortdienste aktiviert sein, um Geräte in der Nähe zu finden."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Standort aktivieren"</string>
<string name="print" msgid="7851318072404916362">"Drucken"</string>
</resources>
diff --git a/res/values-el/strings.xml b/res/values-el/strings.xml
index 532bf5a..859f47a 100644
--- a/res/values-el/strings.xml
+++ b/res/values-el/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Αποδοχή"</string>
<string name="reject" msgid="24751635160440693">"Απόρριψη"</string>
<string name="connections" msgid="8895413761760117180">"Συνδέσεις"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Η προεπιλεγμένη υπηρεσία εκτύπωσης δεν μπορεί να εντοπίσει εκτυπωτές Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Απεν. Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Η υπηρεσία Προεπιλεγμένης εκτύπωσης χρειάζεται την άδεια τοποθεσίας για να εντοπίσει κοντινές συσκευές."</string>
<string name="fix" msgid="7784394272611365393">"Έλεγχος άδειας"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Οι υπηρεσίες τοποθεσίας θα πρέπει να είναι ενεργοποιημένες προκειμένου η προεπιλεγμένη υπηρεσία εκτύπωσης να εντοπίσει κοντινές συσκευές."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Ενεργοπ. τοποθεσίας"</string>
<string name="print" msgid="7851318072404916362">"Εκτύπωση"</string>
</resources>
diff --git a/res/values-en-rAU/strings.xml b/res/values-en-rAU/strings.xml
index a7d4e0a..5a34220 100644
--- a/res/values-en-rAU/strings.xml
+++ b/res/values-en-rAU/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Accept"</string>
<string name="reject" msgid="24751635160440693">"Reject"</string>
<string name="connections" msgid="8895413761760117180">"Connections"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Default print service cannot find Wi-Fi Direct printers"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Disable Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Default Print Service needs location permission to find nearby devices."</string>
<string name="fix" msgid="7784394272611365393">"Review permission"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Default print service needs location services enabled to find nearby devices."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Enable location"</string>
<string name="print" msgid="7851318072404916362">"Print"</string>
</resources>
diff --git a/res/values-en-rCA/strings.xml b/res/values-en-rCA/strings.xml
index 134b15f..75ead59 100644
--- a/res/values-en-rCA/strings.xml
+++ b/res/values-en-rCA/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Accept"</string>
<string name="reject" msgid="24751635160440693">"Reject"</string>
<string name="connections" msgid="8895413761760117180">"Connections"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Default print service cannot find Wi-Fi Direct printers"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Disable Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Default Print Service needs location permission to find nearby devices."</string>
<string name="fix" msgid="7784394272611365393">"Review permission"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Default print service needs location services enabled to find nearby devices."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Enable location"</string>
<string name="print" msgid="7851318072404916362">"Print"</string>
</resources>
diff --git a/res/values-en-rGB/strings.xml b/res/values-en-rGB/strings.xml
index a7d4e0a..5a34220 100644
--- a/res/values-en-rGB/strings.xml
+++ b/res/values-en-rGB/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Accept"</string>
<string name="reject" msgid="24751635160440693">"Reject"</string>
<string name="connections" msgid="8895413761760117180">"Connections"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Default print service cannot find Wi-Fi Direct printers"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Disable Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Default Print Service needs location permission to find nearby devices."</string>
<string name="fix" msgid="7784394272611365393">"Review permission"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Default print service needs location services enabled to find nearby devices."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Enable location"</string>
<string name="print" msgid="7851318072404916362">"Print"</string>
</resources>
diff --git a/res/values-en-rIN/strings.xml b/res/values-en-rIN/strings.xml
index 134b15f..75ead59 100644
--- a/res/values-en-rIN/strings.xml
+++ b/res/values-en-rIN/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Accept"</string>
<string name="reject" msgid="24751635160440693">"Reject"</string>
<string name="connections" msgid="8895413761760117180">"Connections"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Default print service cannot find Wi-Fi Direct printers"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Disable Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Default Print Service needs location permission to find nearby devices."</string>
<string name="fix" msgid="7784394272611365393">"Review permission"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Default print service needs location services enabled to find nearby devices."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Enable location"</string>
<string name="print" msgid="7851318072404916362">"Print"</string>
</resources>
diff --git a/res/values-en-rXC/strings.xml b/res/values-en-rXC/strings.xml
index 5a482c2..3250978 100644
--- a/res/values-en-rXC/strings.xml
+++ b/res/values-en-rXC/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‏‏‎‏‎‏‏‎‏‏‎‎‏‏‎‏‏‎‏‎‏‏‏‏‎‏‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‏‎‎‏‏‏‏‏‏‏‎‎‏‎‏‎‏‏‎‎Accept‎‏‎‎‏‎"</string>
<string name="reject" msgid="24751635160440693">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‎‏‏‏‏‎‏‎‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‎‏‎‏‏‎‎‏‎‎‎‏‏‏‏‏‎‏‏‏‎‏‎‏‎Reject‎‏‎‎‏‎"</string>
<string name="connections" msgid="8895413761760117180">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‎‏‎‏‏‎‏‏‎‏‏‏‎‏‎‏‏‏‏‏‎‏‏‎‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‏‎‎‎Connections‎‏‎‎‏‎"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‏‏‎‎‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‏‏‎‏‏‏‏‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‎‏‏‏‏‏‏‏‎‎Default Print Service cannot find Wi-Fi Direct printers‎‏‎‎‏‎"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‏‎‎‏‏‎‎‎‎‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‏‎‎‎‏‎‎‏‏‏‎‎‎‎‏‏‎‎‏‎Disable Wi-Fi Direct‎‏‎‎‏‎"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‎‏‏‏‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‏‎‏‎‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‏‏‏‎‎‏‎‎‏‏‏‏‏‎‏‎‎‏‎‎Default Print Service needs location permission to find nearby devices.‎‏‎‎‏‎"</string>
<string name="fix" msgid="7784394272611365393">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‎‎‎‎‎‏‏‏‏‎‏‏‏‎‎‏‎‏‎‏‏‎‎‎‏‏‏‏‎‎‏‎‏‎‎‏‎‏‎‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‎‏‎Review permission‎‏‎‎‏‎"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‏‏‎‎‎‏‏‎‏‎‎‎‏‏‎‏‎‏‎‏‎‎‏‎‏‎‏‎‎‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‏‏‏‎‎Default Print Service needs location services enabled to find nearby devices.‎‏‎‎‏‎"</string>
+ <string name="enable_location" msgid="3627841004298863140">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‎‏‏‎‎‏‎‎‏‎‏‏‎‎‎‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‎‎‎‎‏‏‎‏‎‏‏‎‏‎‏‎‎‏‎‎‎‎‎‏‎‎‎‏‎‎‏‎‎‎Enable location‎‏‎‎‏‎"</string>
<string name="print" msgid="7851318072404916362">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‎‎‎‏‏‎‎‎‎‎‏‎‏‎‏‎‎‎‏‎‎‏‏‎‎‏‎‏‏‏‎‎‎‏‎‎‎‏‎‏‎‎Print‎‏‎‎‏‎"</string>
</resources>
diff --git a/res/values-es-rUS/strings.xml b/res/values-es-rUS/strings.xml
index 1549f37..887e2f3 100644
--- a/res/values-es-rUS/strings.xml
+++ b/res/values-es-rUS/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Aceptar"</string>
<string name="reject" msgid="24751635160440693">"Rechazar"</string>
<string name="connections" msgid="8895413761760117180">"Conexiones"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"El servicio de impresión predeterminado no encuentra impresoras con Wi-Fi directo"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Inhab. Wi-Fi directo"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"El servicio de impresión predeterminada requiere permiso de ubicación para encontrar dispositivos cercanos."</string>
<string name="fix" msgid="7784394272611365393">"Revisar permiso"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"El servicio de impresión predeterminado necesita que los servicios de ubicación estén habilitados para encontrar dispositivos cercanos."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Habilitar ubicación"</string>
<string name="print" msgid="7851318072404916362">"Imprimir"</string>
</resources>
diff --git a/res/values-es/strings.xml b/res/values-es/strings.xml
index edf8d18..797fe62 100644
--- a/res/values-es/strings.xml
+++ b/res/values-es/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Aceptar"</string>
<string name="reject" msgid="24751635160440693">"Rechazar"</string>
<string name="connections" msgid="8895413761760117180">"Conexiones"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"El servicio de impresión predeterminada no ha podido encontrar impresoras con Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Bloquear Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"El servicio de impresión predeterminada necesita permisos de ubicación para encontrar dispositivos cercanos."</string>
<string name="fix" msgid="7784394272611365393">"Revisar permiso"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Para que el servicio de impresión predeterminada pueda encontrar dispositivos cercanos, los servicios de ubicación deben estar habilitados."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Habilitar ubicación"</string>
<string name="print" msgid="7851318072404916362">"Imprimir"</string>
</resources>
diff --git a/res/values-et/strings.xml b/res/values-et/strings.xml
index e17b086..d5592d0 100644
--- a/res/values-et/strings.xml
+++ b/res/values-et/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Nõustu"</string>
<string name="reject" msgid="24751635160440693">"Keeldu"</string>
<string name="connections" msgid="8895413761760117180">"Ühendused"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Printimise vaiketeenusel ei õnnestu Wi-Fi Directi printereid leida"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Keela Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Printimise vaiketeenus vajab läheduses olevate seadmete leidmiseks asukohale juurdepääsu luba."</string>
<string name="fix" msgid="7784394272611365393">"Loa ülevaatamine"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Printimise vaiketeenus nõuab, et läheduses olevate seadmete leidmiseks oleks asukohateenused lubatud."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Luba asukoht"</string>
<string name="print" msgid="7851318072404916362">"Prindi"</string>
</resources>
diff --git a/res/values-eu/strings.xml b/res/values-eu/strings.xml
index 577c37d..5cc0c94 100644
--- a/res/values-eu/strings.xml
+++ b/res/values-eu/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Onartu"</string>
<string name="reject" msgid="24751635160440693">"Baztertu"</string>
<string name="connections" msgid="8895413761760117180">"Konexioak"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Inprimatze-zerbitzu lehenetsiak ezin du aurkitu Wi-Fi Direct-eko inprimagailuak"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Desgaitu Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Inprimatze-zerbitzu lehenetsiak kokapena erabiltzeko baimena behar du inguruko gailuak aurkitzeko."</string>
<string name="fix" msgid="7784394272611365393">"Berrikusi baimena"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Inprimatze-zerbitzu lehenetsiak kokapen-zerbitzuak gaituta izan behar ditu inguruko gailuak aurkitzeko."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Gaitu kokapena"</string>
<string name="print" msgid="7851318072404916362">"Inprimatu"</string>
</resources>
diff --git a/res/values-fa/strings.xml b/res/values-fa/strings.xml
index ac81915..b073feb 100644
--- a/res/values-fa/strings.xml
+++ b/res/values-fa/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"پذیرفتن"</string>
<string name="reject" msgid="24751635160440693">"رد کردن"</string>
<string name="connections" msgid="8895413761760117180">"اتصال‌ها"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"‏«سرویس چاپ پیش‌فرض» نمی‌تواند چاپگرهای Wi-Fi بی‌واسطه را پیدا کند"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"‏غیرفعال کردن Wi-Fi بی‌واسطه"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"«سرویس چاپ پیش‌فرض» برای پیدا کردن دستگاه‌های نزدیک به اجازه مکان نیاز دارد."</string>
<string name="fix" msgid="7784394272611365393">"مرور مجوز"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"«سرویس چاپ پیش‌فرض» برای پیدا کردن دستگاه‌های مجاور به خدمات مکان فعال‌شده نیاز دارد."</string>
+ <string name="enable_location" msgid="3627841004298863140">"فعال کردن مکان"</string>
<string name="print" msgid="7851318072404916362">"چاپ"</string>
</resources>
diff --git a/res/values-fi/strings.xml b/res/values-fi/strings.xml
index 6d5cd3f..47fa7e3 100644
--- a/res/values-fi/strings.xml
+++ b/res/values-fi/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Hyväksy"</string>
<string name="reject" msgid="24751635160440693">"Hylkää"</string>
<string name="connections" msgid="8895413761760117180">"Yhteydet"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Oletustulostuspalvelu ei löydä Wi-Fi Direct -tulostimia"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Poista Wi-Fi Direct käytöstä"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Oletustulostuspalvelu tarvitsee sijainnin käyttöoikeuksia lähellä olevien laitteiden löytämiseen."</string>
<string name="fix" msgid="7784394272611365393">"Tarkista käyttöoik."</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Oletustulostuspalvelu tarvitsee sijaintipalveluita lähellä olevien laitteiden löytämiseen."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Sijainti käyttöön"</string>
<string name="print" msgid="7851318072404916362">"Tulosta"</string>
</resources>
diff --git a/res/values-fr-rCA/strings.xml b/res/values-fr-rCA/strings.xml
index 57be38d..63c3f5f 100644
--- a/res/values-fr-rCA/strings.xml
+++ b/res/values-fr-rCA/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Accepter"</string>
<string name="reject" msgid="24751635160440693">"Refuser"</string>
<string name="connections" msgid="8895413761760117180">"Connexions"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Le service d\'impression par défaut ne peut pas trouver les imprimantes Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Désact. Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Le service d\'impression par défaut a besoin de l\'autorisation de localisation pour trouver les imprimantes à proximité."</string>
<string name="fix" msgid="7784394272611365393">"Examiner l\'autorisation"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Le service d\'impression par défaut nécessite que les services de localisation soient activés pour trouver les appareils à proximité."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Activ. localisation"</string>
<string name="print" msgid="7851318072404916362">"Imprimer"</string>
</resources>
diff --git a/res/values-fr/strings.xml b/res/values-fr/strings.xml
index ca97861..83d9033 100644
--- a/res/values-fr/strings.xml
+++ b/res/values-fr/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Accepter"</string>
<string name="reject" msgid="24751635160440693">"Refuser"</string>
<string name="connections" msgid="8895413761760117180">"Connexions"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Le service d\'impression par défaut ne parvient pas à trouver les imprimantes Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Désactiver Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Le service d\'impression par défaut a besoin de l\'autorisation d\'accéder à la position pour détecter les appareils à proximité."</string>
<string name="fix" msgid="7784394272611365393">"Voir l\'autorisation"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Les services de localisation doivent être activés pour que le service d\'impression par défaut puisse détecter les appareils à proximité."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Activer localisation"</string>
<string name="print" msgid="7851318072404916362">"Imprimer"</string>
</resources>
diff --git a/res/values-gl/strings.xml b/res/values-gl/strings.xml
index 572f644..e67e9ff 100644
--- a/res/values-gl/strings.xml
+++ b/res/values-gl/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Aceptar"</string>
<string name="reject" msgid="24751635160440693">"Rexeitar"</string>
<string name="connections" msgid="8895413761760117180">"Conexións"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"O servizo de impresión predeterminado non puido atopar impresoras con Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Desact. Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"O servizo de impresión predeterminado require permisos de acceso á localización para atopar dispositivos próximos."</string>
<string name="fix" msgid="7784394272611365393">"Revisar permiso"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"A función de impresión predeterminada precisa que os servizos de localización estean activados para atopar dispositivos próximos."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Activar localización"</string>
<string name="print" msgid="7851318072404916362">"Imprimir"</string>
</resources>
diff --git a/res/values-gu/strings.xml b/res/values-gu/strings.xml
index 471caad..18e3246 100644
--- a/res/values-gu/strings.xml
+++ b/res/values-gu/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"સ્વીકારો"</string>
<string name="reject" msgid="24751635160440693">"નકારો"</string>
<string name="connections" msgid="8895413761760117180">"કનેક્શન"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"ડિફૉલ્ટ પ્રિન્ટ સેવા Wi-Fi Direct પ્રિન્ટર શોધી શકતી નથી"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct બંધ કરો"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"ડિફૉલ્ટ પ્રિન્ટ સેવાને નજીકના ડિવાઇસ શોઘવા સ્થાન માટેની પરવાનગીની જરૂર છે."</string>
<string name="fix" msgid="7784394272611365393">"પરવાનગીનો રિવ્યૂ કરો"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"ડિફૉલ્ટ પ્રિન્ટ સેવાને નજીકના ડિવાઇસ શોધવા માટે, સ્થાન સેવાઓ ચાલુ કરવાની જરૂર છે."</string>
+ <string name="enable_location" msgid="3627841004298863140">"સ્થાન સેવા ચાલુ કરો"</string>
<string name="print" msgid="7851318072404916362">"પ્રિન્ટ કરો"</string>
</resources>
diff --git a/res/values-hi/strings.xml b/res/values-hi/strings.xml
index 74c6fa4..2e62532 100644
--- a/res/values-hi/strings.xml
+++ b/res/values-hi/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"स्वीकार करें"</string>
<string name="reject" msgid="24751635160440693">"अस्‍वीकार करें"</string>
<string name="connections" msgid="8895413761760117180">"कनेक्शन"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"प्रिंट करने की डिफ़ॉल्ट सेवा को Wi-Fi Direct की सुविधा वाले प्रिंटर नहीं मिले"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct की सुविधा बंद करें"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"आपके आस-पास मौजूद डिवाइस ढूंढने के लिए, डिफ़ॉल्ट प्रिंटिंग सेवा को जगह की जानकारी ऐक्सेस करने की अनुमति की ज़रूरत होती है."</string>
<string name="fix" msgid="7784394272611365393">"अनुमति दें"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"प्रिंट करने की डिफ़ॉल्ट सेवा का इस्तेमाल करने के लिए ज़रूरी है कि \'जगह की जानकारी\' सेटिंग चालू हो. ऐसा करके आप आस-पास मौजूद डिवाइस देख पाएंगे."</string>
+ <string name="enable_location" msgid="3627841004298863140">"\'जगह की जानकारी\' सेटिंग चालू करें"</string>
<string name="print" msgid="7851318072404916362">"प्रिंट करें"</string>
</resources>
diff --git a/res/values-hr/strings.xml b/res/values-hr/strings.xml
index 037df41..f353662 100644
--- a/res/values-hr/strings.xml
+++ b/res/values-hr/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Prihvati"</string>
<string name="reject" msgid="24751635160440693">"Odbij"</string>
<string name="connections" msgid="8895413761760117180">"Veze"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Zadana usluga ispisa ne može pronaći pisače Izravnog Wi-Fija"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Onem. Izravni Wi-Fi"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Zadanoj usluzi ispisa potrebna su dopuštenja za lokaciju kako bi pronašla uređaje u blizini."</string>
<string name="fix" msgid="7784394272611365393">"Pregled dopuštenja"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Zadanoj usluzi ispisa potrebno je omogućiti usluge lokacije kako bi pronašla uređaje u blizini."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Omogući lokaciju"</string>
<string name="print" msgid="7851318072404916362">"Ispis"</string>
</resources>
diff --git a/res/values-hu/strings.xml b/res/values-hu/strings.xml
index 8d8b436..985fa26 100644
--- a/res/values-hu/strings.xml
+++ b/res/values-hu/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Elfogadás"</string>
<string name="reject" msgid="24751635160440693">"Elutasítás"</string>
<string name="connections" msgid="8895413761760117180">"Kapcsolatok"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Az alapértelmezett nyomtatási szolgáltatás nem talál Wi-Fi Directet használó nyomtatókat"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct tiltása"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Az alapértelmezett nyomtatási szolgáltatásnak helymeghatározási jogosultságra van szüksége ahhoz, hogy megtalálja a közelben lévő eszközöket."</string>
<string name="fix" msgid="7784394272611365393">"Engedély áttekintése"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"A közelben lévő eszközök megtalálásához az alapértelmezett nyomtatási szolgáltatásnak szüksége van arra, hogy a helyszolgáltatások engedélyezve legyenek."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Hely engedélyezése"</string>
<string name="print" msgid="7851318072404916362">"Nyomtatás"</string>
</resources>
diff --git a/res/values-hy/strings.xml b/res/values-hy/strings.xml
index 5085349..4bc5ead 100644
--- a/res/values-hy/strings.xml
+++ b/res/values-hy/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Ընդունել"</string>
<string name="reject" msgid="24751635160440693">"Մերժել"</string>
<string name="connections" msgid="8895413761760117180">"Միացումներ"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Տպման կանխադրված ծառայությունը չի կարողանում Wi-Fi Direct-ով տպիչներ գտնել"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Անջատել Wi-Fi Direct-ը"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Մոտակա սարքերը գտնելու համար կանխադրված տպման ծառայությանն անհրաժեշտ է տեղորոշման տվյալների օգտագործման թույլտվություն:"</string>
<string name="fix" msgid="7784394272611365393">"Թույլտվություններ"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Միացրեք տեղորոշման ծառայությունները, որպեսզի տպման կանխադրված ծառայությունը կարողանա մոտակա սարքեր գտնել։"</string>
+ <string name="enable_location" msgid="3627841004298863140">"Միացնել տեղորոշումը"</string>
<string name="print" msgid="7851318072404916362">"Տպել"</string>
</resources>
diff --git a/res/values-in/strings.xml b/res/values-in/strings.xml
index 2b3d135..e93e725 100644
--- a/res/values-in/strings.xml
+++ b/res/values-in/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Setuju"</string>
<string name="reject" msgid="24751635160440693">"Tolak"</string>
<string name="connections" msgid="8895413761760117180">"Koneksi"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Layanan Cetak Default tidak dapat menemukan printer dengan Wi-Fi Langsung"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Nonaktifkan Wi-Fi Langsung"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Layanan Cetakan Default memerlukan izin akses lokasi untuk menemukan perangkat di sekitar."</string>
<string name="fix" msgid="7784394272611365393">"Tinjau izin"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Layanan Cetak Default memerlukan layanan lokasi yang diaktifkan untuk menemukan perangkat di sekitar."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Aktifkan lokasi"</string>
<string name="print" msgid="7851318072404916362">"Cetak"</string>
</resources>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index a4cb7a9..f733f2e 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Samþykkja"</string>
<string name="reject" msgid="24751635160440693">"Hafna"</string>
<string name="connections" msgid="8895413761760117180">"Tengingar"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Sjálfgefin prentþjónusta finnur ekki Wi-Fi Direct-prentara"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Slökkva á Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Sjálfgefin prentþjónusta þarf staðsetningarheimildir til að finna nálæg tæki."</string>
<string name="fix" msgid="7784394272611365393">"Yfirfara heimild"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Sjálfgefin prentþjónusta krefst þess að kveikt sé á staðsetningarþjónustum til að geta fundið nálæg tæki."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Kveikja á staðsetningu"</string>
<string name="print" msgid="7851318072404916362">"Prenta"</string>
</resources>
diff --git a/res/values-it/strings.xml b/res/values-it/strings.xml
index d990130..4580f4d 100644
--- a/res/values-it/strings.xml
+++ b/res/values-it/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Accetta"</string>
<string name="reject" msgid="24751635160440693">"Rifiuta"</string>
<string name="connections" msgid="8895413761760117180">"Connessioni"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Il servizio di stampa predefinito non riesce a trovare stampanti Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Disatt. Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Il servizio di stampa predefinito ha bisogno dell\'autorizzazione di accesso alla posizione per individuare i dispositivi nelle vicinanze."</string>
<string name="fix" msgid="7784394272611365393">"Esamina autorizzaz."</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Devi attivare i Servizi di geolocalizzazione per consentire al servizio di stampa predefinito di individuare i dispositivi nelle vicinanze."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Attiva geolocalizz."</string>
<string name="print" msgid="7851318072404916362">"Stampa"</string>
</resources>
diff --git a/res/values-iw/strings.xml b/res/values-iw/strings.xml
index a80c31a..70806c7 100644
--- a/res/values-iw/strings.xml
+++ b/res/values-iw/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"אישור"</string>
<string name="reject" msgid="24751635160440693">"דחייה"</string>
<string name="connections" msgid="8895413761760117180">"חיבורים"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"‏לא ניתן היה למצוא מדפסות Wi-Fi ישיר במסגרת שירות ההדפסה המוגדר כברירת מחדל"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"‏השבתת Wi-Fi ישיר"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"לשירות ההדפסה המוגדר כברירת מחדל נדרשת הרשאת מיקום כדי למצוא מכשירים בקרבת מקום."</string>
<string name="fix" msgid="7784394272611365393">"בדיקת ההרשאות"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"לשירות ההדפסה המוגדר כברירת מחדל נדרשת הפעלה של שירותי המיקום כדי למצוא מכשירים בקרבת מקום."</string>
+ <string name="enable_location" msgid="3627841004298863140">"הפעלת המיקום"</string>
<string name="print" msgid="7851318072404916362">"הדפסה"</string>
</resources>
diff --git a/res/values-ja/strings.xml b/res/values-ja/strings.xml
index 9fa428f..1c28ba0 100644
--- a/res/values-ja/strings.xml
+++ b/res/values-ja/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"承認"</string>
<string name="reject" msgid="24751635160440693">"拒否"</string>
<string name="connections" msgid="8895413761760117180">"接続"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"デフォルトの印刷サービスが Wi-Fi Direct プリンタを検出できません"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct を無効にする"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"デフォルト印刷サービスが近くのデバイスを検出するには、位置情報の利用許可が必要です。"</string>
<string name="fix" msgid="7784394272611365393">"権限を確認"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"デフォルトの印刷サービスが近くのデバイスを検出するには、位置情報サービスを有効にする必要があります。"</string>
+ <string name="enable_location" msgid="3627841004298863140">"位置情報を有効にする"</string>
<string name="print" msgid="7851318072404916362">"印刷"</string>
</resources>
diff --git a/res/values-ka/strings.xml b/res/values-ka/strings.xml
index ef5b841..1b6723c 100644
--- a/res/values-ka/strings.xml
+++ b/res/values-ka/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"მიღება"</string>
<string name="reject" msgid="24751635160440693">"უარყოფა"</string>
<string name="connections" msgid="8895413761760117180">"კავშირები"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"ბეჭდვის ნაგულისხმევი სერვისი ვერ პოულობს Wi-Fi Direct-თან დაკავშირებულ პრინტერებს"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct-ის გათიშვა"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"ბეჭდვის ნაგულისხმევ სერვისს სჭირდება მდებარეობის ნებართვა ახლომახლო მოწყობილობების საპოვნელად."</string>
<string name="fix" msgid="7784394272611365393">"ნებართვის მიმოხილვა"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"ბეჭდვის ნაგულისხმევ სერვისს სჭირდება მდებარეობის სერვისების ჩართვა ახლომახლო მოწყობილობების საპოვნელად."</string>
+ <string name="enable_location" msgid="3627841004298863140">"მდებარეობის ჩართვა"</string>
<string name="print" msgid="7851318072404916362">"ბეჭდვა"</string>
</resources>
diff --git a/res/values-kk/strings.xml b/res/values-kk/strings.xml
index 29193a0..286f445 100644
--- a/res/values-kk/strings.xml
+++ b/res/values-kk/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Қабылдау"</string>
<string name="reject" msgid="24751635160440693">"Қабылдамау"</string>
<string name="connections" msgid="8895413761760117180">"Байланыстар"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Әдепкі принтер қызметі Wi-Fi Direct принтерлерін таба алмайды."</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct ажырату"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Маңайдағы құрылғыларды табу үшін Әдепкі принтер қызметіне локацияны пайдалану рұқсаты қажет."</string>
<string name="fix" msgid="7784394272611365393">"Рұқсатты қарау"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Әдепкі принтер қызметі маңайдағы құрылғыларды таба алуы үшін локация қызметтерін қосу қажет."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Орын анықтауды қосу"</string>
<string name="print" msgid="7851318072404916362">"Басып шығару"</string>
</resources>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index 6039e52..15840b4 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"ទទួលយក"</string>
<string name="reject" msgid="24751635160440693">"បដិសេធ"</string>
<string name="connections" msgid="8895413761760117180">"ការ​តភ្ជាប់"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"សេវាកម្ម​បោះពុម្ពលំនាំដើម​រកមិនឃើញម៉ាស៊ីនបោះ​ពុម្ពតាម Wi-Fi ផ្ទាល់ទេ"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"បិទ \"តាម Wi-Fi ផ្ទាល់\""</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"សេវាកម្ម​ការបោះពុម្ពលំនាំដើម​ត្រូវការ​ការអនុញ្ញាត​ទីតាំង ដើម្បី​រក​ឧបករណ៍​ដែលនៅជិត។"</string>
<string name="fix" msgid="7784394272611365393">"ពិនិត្យមើលការអនុញ្ញាត"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"សេវាកម្ម​បោះពុម្ពលំនាំដើម​ត្រូវការបើកសេវាកម្ម​ទីតាំង ដើម្បី​រកមើល​ឧបករណ៍​នៅជិតៗ។"</string>
+ <string name="enable_location" msgid="3627841004298863140">"បើកទីតាំង"</string>
<string name="print" msgid="7851318072404916362">"បោះពុម្ព"</string>
</resources>
diff --git a/res/values-kn/strings.xml b/res/values-kn/strings.xml
index a1b04e2..9d2d269 100644
--- a/res/values-kn/strings.xml
+++ b/res/values-kn/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"ಸ್ವೀಕರಿಸಿ"</string>
<string name="reject" msgid="24751635160440693">"ತಿರಸ್ಕರಿಸಿ"</string>
<string name="connections" msgid="8895413761760117180">"ಸಂಪರ್ಕಗಳು"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"ಡೀಫಾಲ್ಟ್ ಪ್ರಿಂಟ್ ಸೇವೆಗೆ Wi-Fi ಡೈರೆಕ್ಟ್ ಪ್ರಿಂಟರ್‌ಗಳನ್ನು ಹುಡುಕಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi ಡೈರೆಕ್ಟ್ ಬೇಡ"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"ಸಮೀಪದಲ್ಲಿರುವ ಸಾಧನಗಳನ್ನು ಹುಡುಕಲು ಡೀಫಾಲ್ಟ್ ಪ್ರಿಂಟ್ ಸೇವೆಗೆ ಸ್ಥಳದ ಅನುಮತಿಗಳ ಅಗತ್ಯವಿದೆ."</string>
<string name="fix" msgid="7784394272611365393">"ಅನುಮತಿ ಪರಿಶೀಲಿಸಿ"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"ಸಮೀಪದಲ್ಲಿರುವ ಸಾಧನಗಳನ್ನು ಹುಡುಕಲು ಡೀಫಾಲ್ಟ್ ಪ್ರಿಂಟ್ ಸೇವೆಗೆ ಸ್ಥಳ ಸೇವೆಗಳನ್ನು ಸಕ್ರಿಯಗೊಳಿಸುವ ಅಗತ್ಯವಿದೆ."</string>
+ <string name="enable_location" msgid="3627841004298863140">"ಸ್ಥಳ ಸಕ್ರಿಯಗೊಳಿಸಿ"</string>
<string name="print" msgid="7851318072404916362">"ಪ್ರಿಂಟ್"</string>
</resources>
diff --git a/res/values-ko/strings.xml b/res/values-ko/strings.xml
index 8d54186..8d067ef 100644
--- a/res/values-ko/strings.xml
+++ b/res/values-ko/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"수락"</string>
<string name="reject" msgid="24751635160440693">"거부"</string>
<string name="connections" msgid="8895413761760117180">"연결"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"기본인쇄 서비스에서 Wi-Fi Direct 프린터를 찾을 수 없습니다."</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct 사용 중지"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"기본 인쇄 서비스를 사용하여 주변 기기를 찾으려면 위치 정보 액세스 권한이 필요합니다."</string>
<string name="fix" msgid="7784394272611365393">"액세스 권한 검토"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"기본인쇄 서비스를 사용하여 주변 기기를 찾으려면 위치 서비스를 사용 설정해야 합니다."</string>
+ <string name="enable_location" msgid="3627841004298863140">"위치 사용"</string>
<string name="print" msgid="7851318072404916362">"인쇄"</string>
</resources>
diff --git a/res/values-ky/strings.xml b/res/values-ky/strings.xml
index faf64f3..1276c74 100644
--- a/res/values-ky/strings.xml
+++ b/res/values-ky/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Макул"</string>
<string name="reject" msgid="24751635160440693">"Четке кагуу"</string>
<string name="connections" msgid="8895413761760117180">"Туташуулар"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Демейки басып чыгаруу кызматы Wi-Fi Direct принтерлерин таппай жатат"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct\'ти өчүрүү"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Жакын жердеги түзмөктөрдү табуу үчүн демейки басып чыгаруу кызматына жайгашкан жерди көрүүгө уруксат керек."</string>
<string name="fix" msgid="7784394272611365393">"Уруксатты карап чыгуу"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Жакын жердеги түзмөктөрдү табуу үчүн демейки басып чыгаруу кызматына жайгашкан жерди көрсөтүү керек."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Жайгашкан жерди иштетүү"</string>
<string name="print" msgid="7851318072404916362">"Басып чыгаруу"</string>
</resources>
diff --git a/res/values-lo/strings.xml b/res/values-lo/strings.xml
index 51fde27..b6a7df9 100644
--- a/res/values-lo/strings.xml
+++ b/res/values-lo/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"ຍອມຮັບ"</string>
<string name="reject" msgid="24751635160440693">"ປະຕິເສດ"</string>
<string name="connections" msgid="8895413761760117180">"ການເຊື່ອມຕໍ່"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"ບໍລິການການ​ພິມ​ມາດ​ຕະ​ຖານບໍ່ສາມາດຊອກເຫັນເຄື່ອງພິມ Wi-Fi Direct ໄດ້"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"ປິດ Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"ບໍລິການການ​ພິມ​ມາດ​ຕະ​ຖານຕ້ອງການສິດອະນຸຍາດສະຖານທີ່ເພື່ອຊອກຫາອຸປະກອນທີ່ຢູ່ໃກ້ຄຽງ."</string>
<string name="fix" msgid="7784394272611365393">"ກວດສອບສິດອະນຸຍາດ"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"ບໍລິການການ​ພິມ​ມາດ​ຕະ​ຖານຕ້ອງການໃຫ້ເປີດການນຳໃຊ້ບໍລິການສະຖານທີ່ເພື່ອຊອກຫາອຸປະກອນໃກ້ຄຽງ."</string>
+ <string name="enable_location" msgid="3627841004298863140">"ເປີດການນຳໃຊ້ສະຖານທີ່"</string>
<string name="print" msgid="7851318072404916362">"ພິມ"</string>
</resources>
diff --git a/res/values-lt/strings.xml b/res/values-lt/strings.xml
index fe50bbe..9918ff2 100644
--- a/res/values-lt/strings.xml
+++ b/res/values-lt/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Sutikti"</string>
<string name="reject" msgid="24751635160440693">"Atmesti"</string>
<string name="connections" msgid="8895413761760117180">"Ryšiai"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Numatytojo spausdinimo paslauga negali rasti „Wi-Fi Direct“ spausdintuvų"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Išj. „Wi-Fi Direct“"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Numatytojo spausdinimo paslaugai reikia leidimo pasiekti vietovės duomenis, kad galėtų rasti netoliese esančius įrenginius."</string>
<string name="fix" msgid="7784394272611365393">"Peržiūros leidimas"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Numatytojo spausdinimo paslaugai reikia įgalinti vietovės paslaugas, kad ji galėtų rasti netoliese esančius įrenginius."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Įgalinti vietovę"</string>
<string name="print" msgid="7851318072404916362">"Spausdinti"</string>
</resources>
diff --git a/res/values-lv/strings.xml b/res/values-lv/strings.xml
index 57a06d1..f298598 100644
--- a/res/values-lv/strings.xml
+++ b/res/values-lv/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Apstiprināt"</string>
<string name="reject" msgid="24751635160440693">"Noraidīt"</string>
<string name="connections" msgid="8895413761760117180">"Savienojumi"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Noklusējuma drukāšanas pakalpojums nevar atrast Wi-Fi Direct printerus."</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Atspējot Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Noklusējuma drukāšanas pakalpojumam nepieciešama atrašanās vietas atļauja, lai noteiktu tuvumā esošas ierīces."</string>
<string name="fix" msgid="7784394272611365393">"Pārskatīt atļauju"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Noklusējuma drukāšanas pakalpojumam nepieciešami iespējoti atrašanās vietu pakalpojumi, lai noteiktu tuvumā esošas ierīces."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Iespējot atrašanās vietu"</string>
<string name="print" msgid="7851318072404916362">"Drukāt"</string>
</resources>
diff --git a/res/values-mk/strings.xml b/res/values-mk/strings.xml
index 990b1d6..c230fc1 100644
--- a/res/values-mk/strings.xml
+++ b/res/values-mk/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Прифати"</string>
<string name="reject" msgid="24751635160440693">"Одбиј"</string>
<string name="connections" msgid="8895413761760117180">"Поврзувања"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Услугата за стандардно печатење не може да ги најде печатачите со Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Оневозможи Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Услугата за стандардно печатење има потреба од дозвола за локација за да најде уреди во близина."</string>
<string name="fix" msgid="7784394272611365393">"Прикажи ја дозволата"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Услугата за стандардно печатење бара да бидат овозможени услугите според локација за да најде уреди во близина."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Овозможи локација"</string>
<string name="print" msgid="7851318072404916362">"Печати"</string>
</resources>
diff --git a/res/values-ml/strings.xml b/res/values-ml/strings.xml
index 3b290ed..4acc963 100644
--- a/res/values-ml/strings.xml
+++ b/res/values-ml/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"അംഗീകരിക്കുക"</string>
<string name="reject" msgid="24751635160440693">"നിരസിക്കുക"</string>
<string name="connections" msgid="8895413761760117180">"കണക്ഷനുകൾ"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"ഡിഫോൾട്ട് പ്രിന്റ് സേവനത്തിന് Wi-Fi ഡയറക്‌ട് പ്രിന്ററുകൾ കണ്ടെത്താനാകുന്നില്ല"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi ഡയറക്‌ട് പ്രവർത്തനരഹിതമാക്കൂ"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"സമീപമുള്ള ഉപകരണങ്ങൾ കണ്ടെത്താൻ ഡിഫോൾട്ട് പ്രിന്റ് സേവനത്തിന് ലൊക്കേഷൻ അനുമതി ആവശ്യമാണ്."</string>
<string name="fix" msgid="7784394272611365393">"അനുമതി അവലോകനം"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"സമീപമുള്ള ഉപകരണങ്ങൾ കണ്ടെത്താൻ ഡിഫോൾട്ട് പ്രിന്റ് സേവനത്തിന് ലൊക്കേഷൻ സേവനങ്ങൾ പ്രവർത്തനക്ഷമമാക്കേണ്ടതുണ്ട്."</string>
+ <string name="enable_location" msgid="3627841004298863140">"ലൊക്കേഷൻ പ്രവർത്തനക്ഷമമാക്കൂ"</string>
<string name="print" msgid="7851318072404916362">"അച്ചടിക്കുക"</string>
</resources>
diff --git a/res/values-mn/strings.xml b/res/values-mn/strings.xml
index af04912..6d48692 100644
--- a/res/values-mn/strings.xml
+++ b/res/values-mn/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Зөвшөөрөх"</string>
<string name="reject" msgid="24751635160440693">"Татгалзах"</string>
<string name="connections" msgid="8895413761760117180">"Холболтууд"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Стандарт хэвлэлтийн үйлчилгээ Wi-Fi Шууд хэвлэгчийг олж чадсангүй"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Шуудыг унтраах"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Стандарт хэвлэлтийн үйлчилгээнд ойролцоох төхөөрөмжүүдийг олоход байршлын зөвшөөрөл шаардлагатай."</string>
<string name="fix" msgid="7784394272611365393">"Зөвшөөрлийг хянах"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Ойролцоох төхөөрөмжүүдийг олохын тулд Стандарт хэвлэлтийн үйлчилгээнд байршлын үйлчилгээг идэвхжүүлсэн байх шаардлагатай."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Байршлыг идэвхжүүлэх"</string>
<string name="print" msgid="7851318072404916362">"Хэвлэх"</string>
</resources>
diff --git a/res/values-mr/strings.xml b/res/values-mr/strings.xml
index 61e5c8d..f241167 100644
--- a/res/values-mr/strings.xml
+++ b/res/values-mr/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"स्वीकारा"</string>
<string name="reject" msgid="24751635160440693">"नकार द्या"</string>
<string name="connections" msgid="8895413761760117180">"कनेक्शन"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"डीफॉल्ट प्रिंट सेवा यास वाय-फाय थेट प्रिंटर आढळले नाहीत"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"वाय-फाय थेट बंद करा"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"डीफॉल्ट प्रिंट सेवेला जवळपासच्या डिव्हाइस शोधण्यासाठी स्थान परवानगी आवश्यक आहे."</string>
<string name="fix" msgid="7784394272611365393">"परीक्षण परवानगी द्या"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"डीफॉल्ट प्रिंट सेवा यास जवळपासची डिव्हाइस शोधण्यासाठी स्थान सेवा सुरू असणे आवश्यक आहे."</string>
+ <string name="enable_location" msgid="3627841004298863140">"स्थान सुरू करा"</string>
<string name="print" msgid="7851318072404916362">"प्रिंट करा"</string>
</resources>
diff --git a/res/values-ms/strings.xml b/res/values-ms/strings.xml
index 7e95702..64275e0 100644
--- a/res/values-ms/strings.xml
+++ b/res/values-ms/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Terima"</string>
<string name="reject" msgid="24751635160440693">"Tolak"</string>
<string name="connections" msgid="8895413761760117180">"Sambungan"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Perkhidmatan Pencetakan Lalai tidak dapat mencari pencetak Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Lumpuhkan Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Perkhidmatan Pencetakan Lalai memerlukan kebenaran lokasi untuk mencari peranti berdekatan."</string>
<string name="fix" msgid="7784394272611365393">"Semak kebenaran"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Perkhidmatan Pencetakan Lalai memerlukan perkhidmatan lokasi didayakan untuk mencari peranti berdekatan."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Dayakan lokasi"</string>
<string name="print" msgid="7851318072404916362">"Cetak"</string>
</resources>
diff --git a/res/values-my/strings.xml b/res/values-my/strings.xml
index b6c78d2..04336c4 100644
--- a/res/values-my/strings.xml
+++ b/res/values-my/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"လက်ခံရန်"</string>
<string name="reject" msgid="24751635160440693">"ပယ်ရန်"</string>
<string name="connections" msgid="8895413761760117180">"ချိတ်ဆက်မှုများ"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"\'မူရင်း ပုံနှိပ်ဝန်ဆောင်မှု\' က တိုက်ရိုက် Wi-Fi ပုံနှိပ်စက်များကို ရှာမတွေ့ပါ"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"တိုက်ရိုက် Wi-Fi ကို ပိတ်ရန်"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"\'ပုံသေ ပုံနှိပ်ပေးမှု ဝန်ဆောင်မှု\' သည် အနီးရှိ စက်ပစ္စည်းများကို ရှာရန် တည်နေရာ ခွင့်ပြုချက်များ လိုအပ်ပါသည်။"</string>
<string name="fix" msgid="7784394272611365393">"ခွင့်ပြုချက် စစ်ရန်"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"\'မူရင်း ပုံနှိပ်ဝန်ဆောင်မှု\' က အနီးရှိ စက်များကိုရှာရန် တည်နေရာဝန်ဆောင်မှုများကို ဖွင့်ထားရန် လိုအပ်ပါသည်။"</string>
+ <string name="enable_location" msgid="3627841004298863140">"တည်နေရာကို ဖွင့်ရန်"</string>
<string name="print" msgid="7851318072404916362">"ပရင့်ထုတ်ရန်"</string>
</resources>
diff --git a/res/values-nb/strings.xml b/res/values-nb/strings.xml
index 63ea822..232349e 100644
--- a/res/values-nb/strings.xml
+++ b/res/values-nb/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Godta"</string>
<string name="reject" msgid="24751635160440693">"Avvis"</string>
<string name="connections" msgid="8895413761760117180">"Tilkoblinger"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Standard utskriftstjeneste finner ikke Wi-Fi Direct-skrivere"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Slå av Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Standard utskriftstjeneste trenger posisjonstillatelse for å finne enheter i nærheten."</string>
<string name="fix" msgid="7784394272611365393">"Gjennomgå tillatelse"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Standard utskriftstjeneste krever at posisjonstjenester er på, for å finne enheter i nærheten."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Slå på posisjon"</string>
<string name="print" msgid="7851318072404916362">"Skriv ut"</string>
</resources>
diff --git a/res/values-ne/strings.xml b/res/values-ne/strings.xml
index c531193..4dcde99 100644
--- a/res/values-ne/strings.xml
+++ b/res/values-ne/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"स्वीकार गर्नुहोस्"</string>
<string name="reject" msgid="24751635160440693">"अस्वीकार गर्नुहोस्"</string>
<string name="connections" msgid="8895413761760117180">"जडानहरू"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"डिफल्ट प्रिन्ट सेवाले Wi-Fi Direct मा कनेक्ट भएको कुनै पनि प्रिन्ट फेला पार्न सकेन"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct अफ गर्नु…"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"डिफल्ट छपाइ सेवालाई वरपरका डिभाइसहरू फेला पार्न स्थानसम्बन्धी अनुमति चाहिन्छ।"</string>
<string name="fix" msgid="7784394272611365393">"अनुमतिको समीक्षा गर्नु"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"डिफल्ट प्रिन्ट सेवाले लोकेसन सर्भिस अन गरेपछि मात्र नजिकैका डिभाइसहरू फेला पार्न सक्छ।"</string>
+ <string name="enable_location" msgid="3627841004298863140">"लोकेसन सर्भिस अन गर्नु…"</string>
<string name="print" msgid="7851318072404916362">"प्रिन्ट गर्नुहोस्"</string>
</resources>
diff --git a/res/values-nl/strings.xml b/res/values-nl/strings.xml
index ee911e8..ffdca5b 100644
--- a/res/values-nl/strings.xml
+++ b/res/values-nl/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Accepteren"</string>
<string name="reject" msgid="24751635160440693">"Weigeren"</string>
<string name="connections" msgid="8895413761760117180">"Verbindingen"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"De standaard afdrukservice kan geen Wifi Direct-printers vinden"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wifi Direct uitzetten"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"De standaard afdrukservice heeft locatierechten nodig om apparaten in de buurt te vinden."</string>
<string name="fix" msgid="7784394272611365393">"Rechten controleren"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"De standaard afdrukservice kan alleen apparaten in de buurt vinden als de locatieservices aanstaan."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Locatie aanzetten"</string>
<string name="print" msgid="7851318072404916362">"Afdrukken"</string>
</resources>
diff --git a/res/values-or/strings.xml b/res/values-or/strings.xml
index 0b2f7ba..fbd6ff1 100644
--- a/res/values-or/strings.xml
+++ b/res/values-or/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"ଗ୍ରହଣ କରନ୍ତୁ"</string>
<string name="reject" msgid="24751635160440693">"ଅଗ୍ରାହ୍ୟ କରନ୍ତୁ"</string>
<string name="connections" msgid="8895413761760117180">"ସଂଯୋଗଗୁଡ଼ିକ"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Wi-Fi Direct ପ୍ରିଣ୍ଟରଗୁଡ଼ିକୁ ଡିଫଲ୍ଟ ପ୍ରିଣ୍ଟ ସେବା ଖୋଜିପାରିବ ନାହିଁ"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct ଅକ୍ଷମ"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"ନିକଟସ୍ଥ ଡିଭାଇସ୍‍ଗୁଡ଼ିକୁ ଖୋଜିବା ପାଇଁ ଡିଫଲ୍ଟ ପ୍ରିଣ୍ଟ ସେବା ଲୋକେସନ୍‍ ଅନୁମତି ଆବଶ୍ୟକ କରୁଛି।"</string>
<string name="fix" msgid="7784394272611365393">"ସମୀକ୍ଷା ଅନୁମତି"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"ଆଖପାଖରେ ଥିବା ଡିଭାଇସଗୁଡ଼ିକୁ ଖୋଜି ପାଇବା ପାଇଁ ଡିଫଲ୍ଟ ପ୍ରିଣ୍ଟ ସେବା ଲୋକେସନ୍ ସେବାଗୁଡ଼ିକୁ ସକ୍ଷମ କରାଯିବା ଆବଶ୍ୟକ କରେ।"</string>
+ <string name="enable_location" msgid="3627841004298863140">"ଲୋକେସନ୍ ସକ୍ଷମ କରନ୍ତୁ"</string>
<string name="print" msgid="7851318072404916362">"ପ୍ରିଣ୍ଟ କରନ୍ତୁ"</string>
</resources>
diff --git a/res/values-pa/strings.xml b/res/values-pa/strings.xml
index 9c402c4..a08e25e 100644
--- a/res/values-pa/strings.xml
+++ b/res/values-pa/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"ਸਵੀਕਾਰ ਕਰੋ"</string>
<string name="reject" msgid="24751635160440693">"ਅਸਵੀਕਾਰ ਕਰੋ"</string>
<string name="connections" msgid="8895413761760117180">"ਕਨੈਕਸ਼ਨ"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਪ੍ਰਿੰਟ ਸੇਵਾ ਵਾਈ-ਫਾਈ ਡਾਇਰੈਕਟ ਪ੍ਰਿੰਟਰਾਂ ਨੂੰ ਨਹੀਂ ਲੱਭ ਸਕੇ"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"ਵਾਈ-ਫਾਈ ਡਾਇਰੈਕਟ ਨੂੰ ਬੰਦ ਕਰੋ"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਪ੍ਰਿੰਟ ਸੇਵਾ ਨੂੰ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸ ਲੱਭਣ ਲਈ ਟਿਕਾਣਾ ਇਜਾਜ਼ਤ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।"</string>
<string name="fix" msgid="7784394272611365393">"ਇਜਾਜ਼ਤ ਦੀ ਸਮੀਖਿਆ ਕਰੋ"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"ਪੂਰਵ-ਨਿਰਧਾਰਤ ਪ੍ਰਿੰਟ ਸੇਵਾ ਨੂੰ ਨਜ਼ਦੀਕੀ ਡੀਵਾਈਸ ਲੱਭਣ ਲਈ ਟਿਕਾਣਾ ਸੇਵਾਵਾਂ ਦੇ ਚਾਲੂ ਹੋਣ ਦੀ ਲੋੜ ਹੁੰਦੀ ਹੈ।"</string>
+ <string name="enable_location" msgid="3627841004298863140">"ਟਿਕਾਣਾ ਚਾਲੂ ਕਰੋ"</string>
<string name="print" msgid="7851318072404916362">"ਪ੍ਰਿੰਟ ਕਰੋ"</string>
</resources>
diff --git a/res/values-pl/strings.xml b/res/values-pl/strings.xml
index 48e5cba..0cfd3ed 100644
--- a/res/values-pl/strings.xml
+++ b/res/values-pl/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Zaakceptuj"</string>
<string name="reject" msgid="24751635160440693">"Odrzuć"</string>
<string name="connections" msgid="8895413761760117180">"Połączenia"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Domyślna usługa drukowania nie może znaleźć drukarek Wi-Fi Direct."</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wyłącz Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Domyślna usługa drukowania wymaga dostępu do lokalizacji, by znaleźć urządzenia w pobliżu."</string>
<string name="fix" msgid="7784394272611365393">"Sprawdź uprawnienia"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Domyślna usługa drukowania wymaga włączenia usług lokalizacyjnych, by znaleźć urządzenia w pobliżu."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Włącz lokalizację"</string>
<string name="print" msgid="7851318072404916362">"Drukuj"</string>
</resources>
diff --git a/res/values-pt-rBR/strings.xml b/res/values-pt-rBR/strings.xml
index e4e4aa9..1204946 100644
--- a/res/values-pt-rBR/strings.xml
+++ b/res/values-pt-rBR/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Aceitar"</string>
<string name="reject" msgid="24751635160440693">"Recusar"</string>
<string name="connections" msgid="8895413761760117180">"Conexões"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"O serviço de impressão padrão não encontrou impressoras com Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Desativar Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"O serviço de impressão padrão precisa da permissão de localização para encontrar os dispositivos próximos."</string>
<string name="fix" msgid="7784394272611365393">"Analisar permissão"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"O serviço de impressão padrão precisa que os Serviços de localização estejam ativados para encontrar dispositivos próximos."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Ativar localização"</string>
<string name="print" msgid="7851318072404916362">"Imprimir"</string>
</resources>
diff --git a/res/values-pt-rPT/strings.xml b/res/values-pt-rPT/strings.xml
index c704f9f..30734b2 100644
--- a/res/values-pt-rPT/strings.xml
+++ b/res/values-pt-rPT/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Aceitar"</string>
<string name="reject" msgid="24751635160440693">"Rejeitar"</string>
<string name="connections" msgid="8895413761760117180">"Ligações"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"O serviço de impressão padrão não consegue encontrar impressoras Wi-Fi Direct."</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Desat. Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"O serviço de impressão padrão necessita de autorização de acesso à localização para procurar dispositivos próximos."</string>
<string name="fix" msgid="7784394272611365393">"Rever autorização"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"O serviço de impressão padrão necessita que os Serviços de localização estejam ativados para procurar dispositivos próximos."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Ativar localização"</string>
<string name="print" msgid="7851318072404916362">"Imprimir"</string>
</resources>
diff --git a/res/values-pt/strings.xml b/res/values-pt/strings.xml
index e4e4aa9..1204946 100644
--- a/res/values-pt/strings.xml
+++ b/res/values-pt/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Aceitar"</string>
<string name="reject" msgid="24751635160440693">"Recusar"</string>
<string name="connections" msgid="8895413761760117180">"Conexões"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"O serviço de impressão padrão não encontrou impressoras com Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Desativar Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"O serviço de impressão padrão precisa da permissão de localização para encontrar os dispositivos próximos."</string>
<string name="fix" msgid="7784394272611365393">"Analisar permissão"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"O serviço de impressão padrão precisa que os Serviços de localização estejam ativados para encontrar dispositivos próximos."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Ativar localização"</string>
<string name="print" msgid="7851318072404916362">"Imprimir"</string>
</resources>
diff --git a/res/values-ro/strings.xml b/res/values-ro/strings.xml
index a644382..c72c305 100644
--- a/res/values-ro/strings.xml
+++ b/res/values-ro/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Acceptați"</string>
<string name="reject" msgid="24751635160440693">"Respingeți"</string>
<string name="connections" msgid="8895413761760117180">"Conexiuni"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Serviciul de imprimare prestabilită nu găsește imprimante cu Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Dezactivați Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Pentru a găsi dispozitive în apropiere, serviciul de imprimare prestabilită necesită permisiuni pentru locație."</string>
<string name="fix" msgid="7784394272611365393">"Examinați permisiunea"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Pentru a găsi dispozitive în apropiere, serviciul de imprimare prestabilită necesită activarea serviciilor de localizare."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Activați locația"</string>
<string name="print" msgid="7851318072404916362">"Printați"</string>
</resources>
diff --git a/res/values-ru/strings.xml b/res/values-ru/strings.xml
index 109f9f2..6c376ca 100644
--- a/res/values-ru/strings.xml
+++ b/res/values-ru/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Принять"</string>
<string name="reject" msgid="24751635160440693">"Отклонить"</string>
<string name="connections" msgid="8895413761760117180">"Подключения"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Службе печати по умолчанию не удалось найти принтеры Wi-Fi Direct."</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Отключить Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Службе печати по умолчанию требуется доступ к данным о местоположении, чтобы найти устройства поблизости."</string>
<string name="fix" msgid="7784394272611365393">"Настроить разрешения"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Службе печати по умолчанию требуется доступ к данным о местоположении, чтобы найти устройства поблизости."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Включить геолокацию"</string>
<string name="print" msgid="7851318072404916362">"Печать"</string>
</resources>
diff --git a/res/values-si/strings.xml b/res/values-si/strings.xml
index 5758147..f65454b 100644
--- a/res/values-si/strings.xml
+++ b/res/values-si/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"පිළිගන්න"</string>
<string name="reject" msgid="24751635160440693">"ප්‍රතික්‍ෂේප කරන්න"</string>
<string name="connections" msgid="8895413761760117180">"සබැඳුම්"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"පෙරනිමි මුද්‍රණ සේවාවට Wi-Fi Direct මුද්‍රණ යන්ත්‍ර සොයා ගත නොහැකිය"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Direct අබල කර."</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"අවට උපාංග සෙවීමට පෙරනිමි මුද්‍රණ සේවාවට ස්ථාන අවසරය අවශ්‍යයි."</string>
<string name="fix" msgid="7784394272611365393">"අවසරය සමාලෝචනය කරන්න"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"අවට උපාංග සෙවීමට පෙරනිමි මුද්‍රණ සේවාවට ස්ථාන සේවා සබල කර තිබීම අවශ්‍යයි."</string>
+ <string name="enable_location" msgid="3627841004298863140">"ස්ථානය සබල කරන්න"</string>
<string name="print" msgid="7851318072404916362">"මුද්‍රණ කරන්න"</string>
</resources>
diff --git a/res/values-sk/strings.xml b/res/values-sk/strings.xml
index 7bc4413..c85685b 100644
--- a/res/values-sk/strings.xml
+++ b/res/values-sk/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Prijať"</string>
<string name="reject" msgid="24751635160440693">"Odmietnuť"</string>
<string name="connections" msgid="8895413761760117180">"Pripojenia"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Predvolená tlačová služba nemôže nájsť tlačiarne Wi‑Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Vypnúť Wi‑Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Predvolená tlačová služba potrebuje povolenie na prístup k polohe, aby mohla vyhľadať zariadenia nablízku."</string>
<string name="fix" msgid="7784394272611365393">"Kontrola povolení"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Predvolená tlačová služba potrebuje zapnuté služby určovania polohy, aby mohla vyhľadať zariadenia v okolí."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Povoliť polohu"</string>
<string name="print" msgid="7851318072404916362">"Tlačiť"</string>
</resources>
diff --git a/res/values-sl/strings.xml b/res/values-sl/strings.xml
index 29adb17..9f85b40 100644
--- a/res/values-sl/strings.xml
+++ b/res/values-sl/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Sprejmi"</string>
<string name="reject" msgid="24751635160440693">"Zavrni"</string>
<string name="connections" msgid="8895413761760117180">"Povezave"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Privzeta storitev tiskanja ne najde tiskalnikov Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Onemogoči Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Privzeta storitev tiskanja za iskanje naprav v bližini potrebuje dovoljenje za lokacijo."</string>
<string name="fix" msgid="7784394272611365393">"Pregled dovoljenja"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Privzeta storitev tiskanja za iskanje naprav v bližini potrebuje omogočene lokacijske storitve."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Omogoči lokacijo"</string>
<string name="print" msgid="7851318072404916362">"Natisni"</string>
</resources>
diff --git a/res/values-sq/strings.xml b/res/values-sq/strings.xml
index 1a2eb1c..ba80651 100644
--- a/res/values-sq/strings.xml
+++ b/res/values-sq/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Prano"</string>
<string name="reject" msgid="24751635160440693">"Refuzo"</string>
<string name="connections" msgid="8895413761760117180">"Lidhjet"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Shërbimi i parazgjedhur i printimit nuk mund të gjejë printerët Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Çaktivizo Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Shërbimi i parazgjedhur i printimit ka nevojë për autorizimin e vendndodhjes për të gjetur pajisjet në afërsi."</string>
<string name="fix" msgid="7784394272611365393">"Rishiko autorizimin"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Shërbimi i parazgjedhur i printimit ka nevojë që të ketë shërbimet e vendndodhjes të aktivizuara për të gjetur pajisjet në afërsi."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Aktivizo vendndodhjen"</string>
<string name="print" msgid="7851318072404916362">"Printo"</string>
</resources>
diff --git a/res/values-sr/strings.xml b/res/values-sr/strings.xml
index 32ee6a2..f5659a2 100644
--- a/res/values-sr/strings.xml
+++ b/res/values-sr/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Прихвати"</string>
<string name="reject" msgid="24751635160440693">"Одбиј"</string>
<string name="connections" msgid="8895413761760117180">"Везе"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Услуга подразумеваног штампања није успела да пронађе WiFi Direct штампаче"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Угаси WiFi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Услузи подразумеваног штампања треба дозвола за локацију да би пронашла уређаје у близини."</string>
<string name="fix" msgid="7784394272611365393">"Прикажи дозволу"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Услузи подразумеваног штампања захтева омогућене услуге локације ради проналажења уређаја у близини."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Омогући локацију"</string>
<string name="print" msgid="7851318072404916362">"Одштампај"</string>
</resources>
diff --git a/res/values-sv/strings.xml b/res/values-sv/strings.xml
index b2c4edc..b2db923 100644
--- a/res/values-sv/strings.xml
+++ b/res/values-sv/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Godkänn"</string>
<string name="reject" msgid="24751635160440693">"Godkänn inte"</string>
<string name="connections" msgid="8895413761760117180">"Anslutningar"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Standardtjänsten för utskrift kan inte hitta skrivare med wifi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"wifi Direct av"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Standardtjänsten för utskrift behöver platsbehörighet för att kunna upptäcka enheter i närheten."</string>
<string name="fix" msgid="7784394272611365393">"Granska behörighet"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Platstjänster måste ha aktiverats för att standardtjänsten för utskrift ska kunna upptäcka enheter i närheten."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Aktivera plats"</string>
<string name="print" msgid="7851318072404916362">"Skriv ut"</string>
</resources>
diff --git a/res/values-sw/strings.xml b/res/values-sw/strings.xml
index 9169b7c..1c280f4 100644
--- a/res/values-sw/strings.xml
+++ b/res/values-sw/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Kubali"</string>
<string name="reject" msgid="24751635160440693">"Kataa"</string>
<string name="connections" msgid="8895413761760117180">"Miunganisho"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Huduma Chaguomsingi ya Kuchapisha imeshindwa kupata printa za Wi-Fi moja kwa moja"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Zima Wi-Fi moja kwa moja"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Huduma Chaguomsingi ya Kuchapisha inahitaji ruhusa ya mahali ili ipate vifaa vilivyo karibu."</string>
<string name="fix" msgid="7784394272611365393">"Kagua ruhusa"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Huduma Chaguomsingi ya Kuchapisha inahitaji uwashe huduma za mahali ili ipate vifaa vilivyo karibu."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Washa data ya mahali"</string>
<string name="print" msgid="7851318072404916362">"Chapisha"</string>
</resources>
diff --git a/res/values-ta/strings.xml b/res/values-ta/strings.xml
index 82409ac..55b358c 100644
--- a/res/values-ta/strings.xml
+++ b/res/values-ta/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"ஏற்கிறேன்"</string>
<string name="reject" msgid="24751635160440693">"நிராகரி"</string>
<string name="connections" msgid="8895413761760117180">"இணைப்புகள்"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"\'இயல்புநிலை அச்சிடுதல் சேவையால்\' வைஃபை டைரக்ட் பிரிண்டர்களைக் கண்டறிய முடியவில்லை"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"ஆஃப் வைஃபை டைரக்ட்"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"அருகிலுள்ள சாதனங்களைக் கண்டறிய \'இயல்புநிலை அச்சிடுதல் சேவைக்கு\' இருப்பிட அனுமதி தேவை."</string>
<string name="fix" msgid="7784394272611365393">"அனுமதியைச் சரிபார்"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"\'இயல்புநிலை அச்சிடுதல் சேவை\' மூலம் அருகிலுள்ள சாதனங்களைக் கண்டறிய, \'இருப்பிடச் சேவைகள்\' அம்சம் இயக்கப்பட்டிருக்க வேண்டும்."</string>
+ <string name="enable_location" msgid="3627841004298863140">"இருப்பிடத்தை இயக்கு"</string>
<string name="print" msgid="7851318072404916362">"அச்சிடு"</string>
</resources>
diff --git a/res/values-te/strings.xml b/res/values-te/strings.xml
index 6e744f2..4f948ab 100644
--- a/res/values-te/strings.xml
+++ b/res/values-te/strings.xml
@@ -31,7 +31,7 @@
<string name="printer_not_encrypted" msgid="1913051469275483673">"ఎన్‌క్రిప్ట్ చేయబడలేదు"</string>
<string name="printer_check" msgid="6428369671197132828">"ప్రింటర్‌ని తనిఖీ చేయి"</string>
<string name="waiting_to_send" msgid="2022115199902822180">"పంపడానికి వేచి ఉంది"</string>
- <string name="unreadable_input" msgid="2199948329556527912">"పత్రాన్ని చదవడం సాధ్యం కాలేదు"</string>
+ <string name="unreadable_input" msgid="2199948329556527912">"డాక్యుమెంట్‌ను చదవడం సాధ్యం కాలేదు"</string>
<string name="media_size_l" msgid="164416542021598181">"L"</string>
<string name="media_size_5x7in" msgid="1275128379533195285">"5x7 అం."</string>
<string name="media_size_89x119mm" msgid="6828167243395807385">"89x119 మి.మీ."</string>
@@ -66,12 +66,16 @@
<string name="recommendation_enable_summary" msgid="3500907868251326224">"ప్రారంభించడానికి ఎంచుకోండి"</string>
<string name="recommendation_manage" msgid="4683640588502866284">"సేవలను నిర్వహించు"</string>
<string name="security" msgid="2279008326210305401">"సెక్యూరిటీ"</string>
- <string name="certificate_update_request" msgid="1314796413107139475">"ఈ ప్రింటర్‌కి కొత్త భద్రతా సర్టిఫికెట్‌ అందించి ఉండవచ్చు లేదా వేరే పరికరం ఏదైనా దీన్ని అనుకరిస్తూ ఉండవచ్చు. కొత్త సర్టిఫికెట్‌ని ఆమోదిస్తారా?"</string>
+ <string name="certificate_update_request" msgid="1314796413107139475">"ఈ ప్రింటర్‌కు కొత్త సెక్యూరిటీ సర్టిఫికెట్‌ అందించి ఉండవచ్చు, లేదా వేరే పరికరం ఏదైనా దీన్ని అనుకరిస్తూ ఉండవచ్చు. కొత్త సర్టిఫికెట్‌ను ఆమోదిస్తారా?"</string>
<string name="not_encrypted_request" msgid="4871472176807381642">"ఈ ప్రింటర్ ఇకపై ఎన్‌క్రిప్ట్ చేసిన ఫైళ్లను తీసుకోదు అయినా ప్రింట్ చేయడాన్ని కొనసాగిస్తారా?"</string>
<string name="accept" msgid="4426153292469698134">"ఆమోదించు"</string>
<string name="reject" msgid="24751635160440693">"తిరస్కరించు"</string>
<string name="connections" msgid="8895413761760117180">"కనెక్షన్‌లు"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"ఆటోమేటిక్ ప్రింట్ సర్వీస్, Wi-Fi Direct ప్రింటర్‌లను కనుగొనలేకపోయింది"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Directను డిజేబుల్ చేయి"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"సమీపంలో ఉన్న పరికరాలను కనుగొనడానికి ఆటోమేటిక్‌ ప్రింట్ సర్వీస్‌కు లొకేషన్ అనుమతి అవసరం."</string>
<string name="fix" msgid="7784394272611365393">"అనుమతిని సమీక్షించు"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"సమీపంలోని పరికరాలను కనుగొనడానికి ఆటోమేటిక్ ప్రింట్ సర్వీస్ పని చేయాలంటే లొకేషన్ సర్వీస్‌లు ఎనేబుల్ చేసి ఉండడం అవసరం."</string>
+ <string name="enable_location" msgid="3627841004298863140">"లొకేషన్‌ను ఎనేబుల్ చేయి"</string>
<string name="print" msgid="7851318072404916362">"ప్రింట్ చేయి"</string>
</resources>
diff --git a/res/values-th/strings.xml b/res/values-th/strings.xml
index 49b69c4..411dba9 100644
--- a/res/values-th/strings.xml
+++ b/res/values-th/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"ยอมรับ"</string>
<string name="reject" msgid="24751635160440693">"ปฏิเสธ"</string>
<string name="connections" msgid="8895413761760117180">"การเชื่อมต่อ"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"บริการการพิมพ์เริ่มต้นไม่พบเครื่องพิมพ์ Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"ปิดใช้ Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"บริการการพิมพ์เริ่มต้นต้องมีสิทธิ์เข้าถึงตำแหน่งเพื่อหาอุปกรณ์ที่อยู่ใกล้เคียง"</string>
<string name="fix" msgid="7784394272611365393">"ตรวจสอบสิทธิ์"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"บริการการพิมพ์เริ่มต้นต้องเปิดใช้บริการตำแหน่งเพื่อหาอุปกรณ์ที่อยู่ใกล้เคียง"</string>
+ <string name="enable_location" msgid="3627841004298863140">"เปิดใช้ตำแหน่ง"</string>
<string name="print" msgid="7851318072404916362">"พิมพ์"</string>
</resources>
diff --git a/res/values-tl/strings.xml b/res/values-tl/strings.xml
index 313241a..b9fec77 100644
--- a/res/values-tl/strings.xml
+++ b/res/values-tl/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Tanggapin"</string>
<string name="reject" msgid="24751635160440693">"Tanggihan"</string>
<string name="connections" msgid="8895413761760117180">"Mga Koneksyon"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Hindi puwedeng maghanap ng mga printer ng Wi-Fi Direct ang Default na Serbisyo sa Pag-print"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"I-disable ang Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Kailangan ng Default na Serbisyo sa Pag-print ng pahintulot sa lokayson para maghanap ng mga device sa malapit."</string>
<string name="fix" msgid="7784394272611365393">"Pahintulot na sumuri"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Kailangan ng Default na Serbisyo sa Pag-print na naka-enable ang mga serbisyo ng lokayson para maghanap ng mga device sa malapit."</string>
+ <string name="enable_location" msgid="3627841004298863140">"I-enable ang lokasyon"</string>
<string name="print" msgid="7851318072404916362">"I-print"</string>
</resources>
diff --git a/res/values-tr/strings.xml b/res/values-tr/strings.xml
index 538e68d..c196602 100644
--- a/res/values-tr/strings.xml
+++ b/res/values-tr/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Kabul et"</string>
<string name="reject" msgid="24751635160440693">"Reddet"</string>
<string name="connections" msgid="8895413761760117180">"Bağlantılar"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Varsayılan Yazdırma Hizmeti, Kablosuz Doğrudan Bağlantı yazıcılarını bulamıyor"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Kablosuz Doğrudan Bağlantı\'yı kapat"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Varsayılan Yazdırma Hizmeti\'nin yakındaki cihazları bulabilmesi için konum iznine ihtiyacı var."</string>
<string name="fix" msgid="7784394272611365393">"İzni incele"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Varsayılan Yazdırma Hizmeti\'nin yakındaki cihazları bulabilmesi için konum hizmetlerinin etkinleştirilmiş olması gerekir."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Konumu etkinleştir"</string>
<string name="print" msgid="7851318072404916362">"Yazdır"</string>
</resources>
diff --git a/res/values-uk/strings.xml b/res/values-uk/strings.xml
index 289fbea..2c3645f 100644
--- a/res/values-uk/strings.xml
+++ b/res/values-uk/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Прийняти"</string>
<string name="reject" msgid="24751635160440693">"Відхилити"</string>
<string name="connections" msgid="8895413761760117180">"З\'єднання"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Стандартний сервіс друку не може знайти принтери Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Вимк. Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Стандартному сервісу друку потрібен дозвіл на доступ до геоданих, щоб знаходити пристрої поруч."</string>
<string name="fix" msgid="7784394272611365393">"Перевірити дозволи"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Стандартний сервіс друку знаходитиме пристрої поруч, лише якщо ввімкнути служби локації."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Увімкнути геодані"</string>
<string name="print" msgid="7851318072404916362">"Друк"</string>
</resources>
diff --git a/res/values-ur/strings.xml b/res/values-ur/strings.xml
index 4be66c2..801d046 100644
--- a/res/values-ur/strings.xml
+++ b/res/values-ur/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"قبول کریں"</string>
<string name="reject" msgid="24751635160440693">"مسترد کریں"</string>
<string name="connections" msgid="8895413761760117180">"کنکشنز"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"‏ڈیفالٹ پرنٹ سروس Wi-Fi ڈائریکٹ پرنٹرز تلاش نہیں کر سکی"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"‏Wi-Fi ڈائریکٹ غیر فعال کریں"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"قریبی آلات تلاش کرنے کے لیے ڈیفالٹ پرنٹ سروس کو مقام کی اجازت درکار ہے۔"</string>
<string name="fix" msgid="7784394272611365393">"اجازت کا جائزہ لیں"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"قریبی آلات تلاش کرنے کے لیے ڈیفالٹ پرنٹ سروس کو مقام کی سروسز فعال کرنے کی ضرورت ہے۔"</string>
+ <string name="enable_location" msgid="3627841004298863140">"مقام فعال کریں"</string>
<string name="print" msgid="7851318072404916362">"پرنٹ کریں"</string>
</resources>
diff --git a/res/values-uz/strings.xml b/res/values-uz/strings.xml
index 9bc5929..dec3a09 100644
--- a/res/values-uz/strings.xml
+++ b/res/values-uz/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Roziman"</string>
<string name="reject" msgid="24751635160440693">"Rad etaman"</string>
<string name="connections" msgid="8895413761760117180">"Ulanishlar"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Asosiy chop etish xizmati Wi-Fi Direct printerlarini topa olmadi"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Wi-Fi Directni oʻchirish"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Birlamchi chop etish xizmati yaqin-atrofdagi printerlarni ishlatishi uchun ruxsat berilishi kerak."</string>
<string name="fix" msgid="7784394272611365393">"Ruxsatni tekshirish"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Asosiy chop etish xizmati yaqin-atrofdagi qurilmalarni topishi uchun joylashuvni aniqlash xizmati yoqilishi lozim."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Geolokatsiyani yoqish"</string>
<string name="print" msgid="7851318072404916362">"Chop etish"</string>
</resources>
diff --git a/res/values-vi/strings.xml b/res/values-vi/strings.xml
index f6ffc9e..822da9e 100644
--- a/res/values-vi/strings.xml
+++ b/res/values-vi/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Chấp nhận"</string>
<string name="reject" msgid="24751635160440693">"Từ chối"</string>
<string name="connections" msgid="8895413761760117180">"Kết nối"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Dịch vụ in mặc định không tìm thấy các máy in hỗ trợ Wi-Fi Direct"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Tắt Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Dịch vụ in mặc định cần có quyền truy cập vào vị trí để tìm các thiết bị lân cận."</string>
<string name="fix" msgid="7784394272611365393">"Xem lại quyền"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Bạn phải bật dịch vụ vị trí để dịch vụ in mặc định tìm thấy các thiết bị ở gần."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Bật dịch vụ vị trí"</string>
<string name="print" msgid="7851318072404916362">"In"</string>
</resources>
diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 8a6f707..c7edf8a 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"接受"</string>
<string name="reject" msgid="24751635160440693">"拒绝"</string>
<string name="connections" msgid="8895413761760117180">"连接"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"默认打印服务找不到 WLAN 直连打印机"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"停用 WLAN 直连"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"默认打印服务需要位置信息获取权才能寻找附近的设备。"</string>
<string name="fix" msgid="7784394272611365393">"查看权限"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"需要启用位置信息服务,默认打印服务才能查找附近的设备。"</string>
+ <string name="enable_location" msgid="3627841004298863140">"启用位置信息服务"</string>
<string name="print" msgid="7851318072404916362">"打印"</string>
</resources>
diff --git a/res/values-zh-rHK/strings.xml b/res/values-zh-rHK/strings.xml
index 9dbb248..7b90da9 100644
--- a/res/values-zh-rHK/strings.xml
+++ b/res/values-zh-rHK/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"接受"</string>
<string name="reject" msgid="24751635160440693">"拒絕"</string>
<string name="connections" msgid="8895413761760117180">"連線"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"「預設列印服務」找不到 Wi-Fi Direct 打印機"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"停用 Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"「預設列印服務」需要位置資訊權限,以尋找附近的裝置。"</string>
<string name="fix" msgid="7784394272611365393">"查看權限"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"「預設列印服務」需要啟用定位服務,以尋找附近的裝置。"</string>
+ <string name="enable_location" msgid="3627841004298863140">"啟用位置"</string>
<string name="print" msgid="7851318072404916362">"列印"</string>
</resources>
diff --git a/res/values-zh-rTW/strings.xml b/res/values-zh-rTW/strings.xml
index b946703..6cd20bf 100644
--- a/res/values-zh-rTW/strings.xml
+++ b/res/values-zh-rTW/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"接受"</string>
<string name="reject" msgid="24751635160440693">"拒絕"</string>
<string name="connections" msgid="8895413761760117180">"連線"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"預設列印服務找不到 Wi-Fi Direct 印表機"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"停用 Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"預設列印服務需要你的位置資訊存取權,才能尋找附近的裝置。"</string>
<string name="fix" msgid="7784394272611365393">"查看權限"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"如要使用預設列印服務,請啟用定位服務,系統才能尋找附近的裝置。"</string>
+ <string name="enable_location" msgid="3627841004298863140">"啟用定位服務"</string>
<string name="print" msgid="7851318072404916362">"列印"</string>
</resources>
diff --git a/res/values-zu/strings.xml b/res/values-zu/strings.xml
index 52ac1ea..be5564a 100644
--- a/res/values-zu/strings.xml
+++ b/res/values-zu/strings.xml
@@ -71,7 +71,11 @@
<string name="accept" msgid="4426153292469698134">"Yamukela"</string>
<string name="reject" msgid="24751635160440693">"Nqaba"</string>
<string name="connections" msgid="8895413761760117180">"Oxhumana nabo"</string>
+ <string name="wifi_direct_problem" msgid="8995174986718516990">"Isevisi yokuphrinta ezenzakalelayo ayikwazi ukuthola amaphrinta we-Wi-Fi"</string>
+ <string name="disable_wifi_direct" msgid="4824677957241687577">"Khubaza i-Wi-Fi Direct"</string>
<string name="wifi_direct_permission_rationale" msgid="3599186620970379218">"Isevisi yokuphrinta ezenzakalelayo idinga imvume yendawo ukuthola amadivayisi aseduzane."</string>
<string name="fix" msgid="7784394272611365393">"Buyekeza imvume"</string>
+ <string name="wifi_direct_location_rationale" msgid="5084311320511965454">"Isevisi yokuphrinta ezenzakalelayo idinga ukuthi amasevisi wendawo anikwe amandla ukuthola amadivayisi aseduze."</string>
+ <string name="enable_location" msgid="3627841004298863140">"Vumela indawo"</string>
<string name="print" msgid="7851318072404916362">"Phrinta"</string>
</resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 46b5ce4..f309c88 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -111,10 +111,18 @@
<!-- Channel name for connection-related notifications [CHAR LIMIT=40] -->
<string name="connections">Connections</string>
- <!-- Message shown in dialog, toast, or notification if the service cannot get Wi-Fi Direct permissions [CHAR LIMIT=UNLIMITED] -->
+ <!-- Message shown in notification if there is a problem accessing Wi-Fi Direct [CHAR LIMIT=UNLIMITED] -->
+ <string name="wifi_direct_problem">Default Print Service cannot find Wi-Fi Direct printers</string>
+ <!-- Button with negative response to permissions or location request, disabling Wi-Fi Direct [CHAR LIMIT=20] -->
+ <string name="disable_wifi_direct">Disable Wi-Fi Direct</string>
+ <!-- Message shown in dialog or toast if the service cannot get Wi-Fi Direct permissions [CHAR LIMIT=UNLIMITED] -->
<string name="wifi_direct_permission_rationale">Default Print Service needs location permission to find nearby devices.</string>
<!-- Button label in a notification or dialog. This button leads to a request to grant permissions [CHAR LIMIT=20] -->
<string name="fix">Review permission</string>
+ <!-- Message shown in dialog or toast if location is required but disabled [CHAR LIMIT=UNLIMITED] -->
+ <string name="wifi_direct_location_rationale">Default Print Service needs location services enabled to find nearby devices.</string>
+ <!-- Button label in a notification or dialog. This button leads to location settings [CHAR LIMIT=20] -->
+ <string name="enable_location">Enable location</string>
<!-- Share-to-print label [CHAR LIMIT=20] -->
<string name="print">Print</string>
diff --git a/src/com/android/bips/BuiltInPrintService.java b/src/com/android/bips/BuiltInPrintService.java
index f9931a5..e62cb66 100644
--- a/src/com/android/bips/BuiltInPrintService.java
+++ b/src/com/android/bips/BuiltInPrintService.java
@@ -68,6 +68,8 @@ public class BuiltInPrintService extends PrintService {
BuiltInPrintService.class.getCanonicalName() + ".CERTIFICATE_REJECT";
public static final String ACTION_P2P_PERMISSION_CANCEL =
BuiltInPrintService.class.getCanonicalName() + ".P2P_PERMISSION_CANCEL";
+ public static final String ACTION_P2P_DISABLE =
+ BuiltInPrintService.class.getCanonicalName() + ".ACTION_P2P_DISABLE";
private static final String EXTRA_CERTIFICATE = "certificate";
private static final String EXTRA_PRINTER_ID = "printer-id";
private static final String EXTRA_PRINTER_UUID = "printer-uuid";
@@ -315,13 +317,13 @@ public class BuiltInPrintService extends PrintService {
.setAction(ACTION_CERTIFICATE_REJECT)
.putExtra(EXTRA_PRINTER_ID, printerId);
PendingIntent pendingRejectIntent = PendingIntent.getService(this, CERTIFICATE_REQUEST_ID,
- rejectIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+ rejectIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
Notification.Action rejectAction = new Notification.Action.Builder(
Icon.createWithResource(this, R.drawable.ic_printservice),
getString(R.string.reject), pendingRejectIntent).build();
PendingIntent deleteIntent = PendingIntent.getService(this, CERTIFICATE_REQUEST_ID,
- rejectIntent, 0);
+ rejectIntent, PendingIntent.FLAG_IMMUTABLE);
Intent acceptIntent = new Intent(this, BuiltInPrintService.class)
.setAction(ACTION_CERTIFICATE_ACCEPT)
@@ -331,7 +333,7 @@ public class BuiltInPrintService extends PrintService {
acceptIntent.putExtra(EXTRA_CERTIFICATE, certificate);
}
PendingIntent pendingAcceptIntent = PendingIntent.getService(this, CERTIFICATE_REQUEST_ID,
- acceptIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+ acceptIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
Notification.Action acceptAction = new Notification.Action.Builder(
Icon.createWithResource(this, R.drawable.ic_printservice),
getString(R.string.accept), pendingAcceptIntent).build();
@@ -377,6 +379,8 @@ public class BuiltInPrintService extends PrintService {
} else if (ACTION_P2P_PERMISSION_CANCEL.equals(intent.getAction())) {
// Inform p2pPermissionManager the user canceled the notification (non-permanent)
mP2pPermissionManager.applyPermissionChange(false);
+ } else if (ACTION_P2P_DISABLE.equals(intent.getAction())) {
+ mP2pPermissionManager.applyPermissionChange(true);
}
return START_NOT_STICKY;
}
diff --git a/src/com/android/bips/ImagePrintActivity.java b/src/com/android/bips/ImagePrintActivity.java
index 8ff7ed5..765303a 100644
--- a/src/com/android/bips/ImagePrintActivity.java
+++ b/src/com/android/bips/ImagePrintActivity.java
@@ -24,6 +24,7 @@ import android.graphics.BitmapFactory;
import android.graphics.Canvas;
import android.graphics.ColorMatrix;
import android.graphics.ColorMatrixColorFilter;
+import android.graphics.ColorSpace;
import android.graphics.Paint;
import android.net.Uri;
import android.os.AsyncTask;
@@ -118,6 +119,7 @@ public class ImagePrintActivity extends Activity {
// Publish progress and load for real
publishProgress(options.outHeight > options.outWidth);
options.inJustDecodeBounds = false;
+ options.inPreferredColorSpace = ColorSpace.get(ColorSpace.Named.SRGB);
return loadBitmap(uris[0], options);
}
}
diff --git a/src/com/android/bips/LocalPrinter.java b/src/com/android/bips/LocalPrinter.java
index b8f3da6..8d547ba 100644
--- a/src/com/android/bips/LocalPrinter.java
+++ b/src/com/android/bips/LocalPrinter.java
@@ -16,6 +16,8 @@
package com.android.bips;
+import android.app.PendingIntent;
+import android.content.Intent;
import android.net.Uri;
import android.print.PrinterCapabilitiesInfo;
import android.print.PrinterId;
@@ -29,9 +31,11 @@ import com.android.bips.ipp.CapabilitiesCache;
import com.android.bips.jni.LocalPrinterCapabilities;
import com.android.bips.p2p.P2pPrinterConnection;
import com.android.bips.p2p.P2pUtils;
+import com.android.bips.ui.MoreOptionsActivity;
import java.net.InetAddress;
import java.util.Collections;
+import java.util.UUID;
/**
* A session-specific printer record. Encapsulates logic for getting the latest printer
@@ -87,7 +91,8 @@ class LocalPrinter implements CapabilitiesCache.OnLocalPrinterCapabilities {
mPrinterId, mDiscoveredPrinter.name,
PrinterInfo.STATUS_IDLE)
.setIconResourceId(R.drawable.ic_printer)
- .setDescription(mPrintService.getDescription(mDiscoveredPrinter));
+ .setDescription(mPrintService.getDescription(mDiscoveredPrinter))
+ .setInfoIntent(getMoreOptionsActivityPendingIntent());
return builder.build();
} else if (!knownGood) {
// Ignore unknown LAN printers with no caps
@@ -110,7 +115,8 @@ class LocalPrinter implements CapabilitiesCache.OnLocalPrinterCapabilities {
mPrinterId, printer.name,
idle ? PrinterInfo.STATUS_IDLE : PrinterInfo.STATUS_UNAVAILABLE)
.setIconResourceId(R.drawable.ic_printer)
- .setDescription(mPrintService.getDescription(mDiscoveredPrinter));
+ .setDescription(mPrintService.getDescription(mDiscoveredPrinter))
+ .setInfoIntent(getMoreOptionsActivityPendingIntent());
if (mCapabilities != null) {
// Add capabilities if we have them
@@ -242,4 +248,19 @@ class LocalPrinter implements CapabilitiesCache.OnLocalPrinterCapabilities {
public String toString() {
return mDiscoveredPrinter.toString();
}
+
+ /**
+ * Returns a pending intent to the more options activity with the given printer info as an extra
+ * @return Pending Intent
+ */
+ public PendingIntent getMoreOptionsActivityPendingIntent() {
+ return PendingIntent.getActivity(
+ mPrintService,
+ mPrinterId.hashCode(),
+ new Intent(mPrintService, MoreOptionsActivity.class)
+ .setIdentifier(UUID.randomUUID().toString())
+ .putExtra(MoreOptionsActivity.EXTRA_PRINTER_ID, mPrinterId),
+ PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE
+ );
+ }
}
diff --git a/src/com/android/bips/P2pPermissionManager.java b/src/com/android/bips/P2pPermissionManager.java
index d055a22..027d764 100644
--- a/src/com/android/bips/P2pPermissionManager.java
+++ b/src/com/android/bips/P2pPermissionManager.java
@@ -25,11 +25,12 @@ import android.app.NotificationChannel;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.content.Context;
-import android.content.DialogInterface;
import android.content.Intent;
import android.content.SharedPreferences;
import android.content.pm.PackageManager;
import android.graphics.drawable.Icon;
+import android.location.LocationManager;
+import android.provider.Settings;
import android.util.Log;
import android.widget.Toast;
@@ -45,6 +46,7 @@ public class P2pPermissionManager {
private static final String CHANNEL_ID_CONNECTIONS = "connections";
public static final int REQUEST_P2P_PERMISSION_CODE = 1000;
+ public static final int REQUEST_LOCATION_ENABLE = 1001;
private static final String STATE_KEY = "state";
@@ -73,7 +75,7 @@ public class P2pPermissionManager {
* Update the current P2P permissions request state.
*/
public void setState(State state) {
- if (DEBUG) Log.d(TAG, "Setting state=" + state);
+ if (DEBUG) Log.d(TAG, "State from " + mPrefs.getString(STATE_KEY, "?") + " to " + state);
mPrefs.edit().putString(STATE_KEY, state.name()).apply();
}
@@ -91,11 +93,15 @@ public class P2pPermissionManager {
closeNotification();
if (hasP2pPermission()) {
setState(State.ALLOWED);
- } else {
- // Inform the user and don't try again for the rest of this session.
- setState(permanent ? State.DISABLED : State.TEMPORARILY_DISABLED);
- Toast.makeText(mContext, R.string.wifi_direct_permission_rationale, Toast.LENGTH_LONG)
- .show();
+ } else if (getState() != State.DISABLED) {
+ if (permanent) {
+ setState(State.DISABLED);
+ } else {
+ // Inform the user and don't try again for the rest of this session.
+ setState(State.TEMPORARILY_DISABLED);
+ Toast.makeText(mContext, R.string.wifi_direct_permission_rationale,
+ Toast.LENGTH_LONG).show();
+ }
}
}
@@ -133,10 +139,15 @@ public class P2pPermissionManager {
if (mContext instanceof Activity) {
Activity activity = (Activity) mContext;
- if (explain && activity.shouldShowRequestPermissionRationale(ACCESS_FINE_LOCATION)) {
- explain(activity);
- } else {
- request(activity);
+ if (!isLocationEnabled()) {
+ requestLocation(activity);
+ } else if (!hasP2pPermission()) {
+ if (explain && activity.shouldShowRequestPermissionRationale(
+ ACCESS_FINE_LOCATION)) {
+ explain(activity);
+ } else {
+ request(activity);
+ }
}
} else {
showNotification();
@@ -159,18 +170,30 @@ public class P2pPermissionManager {
private void explain(Activity activity) {
// User denied, but asked us to use P2P, so explain and redirect to settings
- DialogInterface.OnClickListener clickListener = (dialog, which) -> {
- if (which == DialogInterface.BUTTON_POSITIVE) {
- request(activity);
- }
- };
-
new AlertDialog.Builder(activity, android.R.style.Theme_DeviceDefault_Light_Dialog_Alert)
.setMessage(mContext.getString(R.string.wifi_direct_permission_rationale))
- .setPositiveButton(R.string.fix, clickListener)
+ .setPositiveButton(R.string.fix, (dialog, which) -> request(activity))
.show();
}
+ /**
+ * Request location services be enabled globally.
+ */
+ private void requestLocation(Activity activity) {
+ new AlertDialog.Builder(activity, android.R.style.Theme_DeviceDefault_Light_Dialog_Alert)
+ .setMessage(mContext.getString(R.string.wifi_direct_location_rationale))
+ .setPositiveButton(R.string.enable_location, (dialog, which) ->
+ activity.startActivityForResult(new Intent(
+ Settings.ACTION_LOCATION_SOURCE_SETTINGS), REQUEST_LOCATION_ENABLE)
+ )
+ .setOnCancelListener(dialog -> {
+ if (getState() == State.DENIED) {
+ setState(State.TEMPORARILY_DISABLED);
+ }
+ })
+ .show();
+ }
+
private SharedPreferences.OnSharedPreferenceChangeListener listenForPreferenceChanges(
P2pPermissionListener listener) {
SharedPreferences.OnSharedPreferenceChangeListener preferenceListener =
@@ -202,7 +225,7 @@ public class P2pPermissionManager {
proceedIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TASK);
proceedIntent.putExtra(AddPrintersFragment.EXTRA_FIX_P2P_PERMISSION, true);
PendingIntent proceedPendingIntent = PendingIntent.getActivity(mContext, 0,
- proceedIntent, PendingIntent.FLAG_UPDATE_CURRENT);
+ proceedIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
Notification.Action fixAction = new Notification.Action.Builder(
Icon.createWithResource(mContext, R.drawable.ic_printservice),
mContext.getString(R.string.fix), proceedPendingIntent).build();
@@ -211,20 +234,27 @@ public class P2pPermissionManager {
.setAction(BuiltInPrintService.ACTION_P2P_PERMISSION_CANCEL);
PendingIntent cancelPendingIndent = PendingIntent.getService(mContext,
BuiltInPrintService.P2P_PERMISSION_REQUEST_ID, cancelIntent,
- PendingIntent.FLAG_UPDATE_CURRENT);
- Notification.Action cancelAction = new Notification.Action.Builder(
+ PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+
+ Intent disableIntent = new Intent(mContext, BuiltInPrintService.class)
+ .setAction(BuiltInPrintService.ACTION_P2P_DISABLE);
+ PendingIntent disablePendingIndent = PendingIntent.getService(mContext,
+ BuiltInPrintService.P2P_PERMISSION_REQUEST_ID, disableIntent,
+ PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE);
+ Notification.Action disableAction = new Notification.Action.Builder(
Icon.createWithResource(mContext, R.drawable.ic_printservice),
- mContext.getString(android.R.string.cancel), cancelPendingIndent).build();
+ mContext.getString(R.string.disable_wifi_direct), disablePendingIndent).build();
Notification notification = new Notification.Builder(mContext, CHANNEL_ID_CONNECTIONS)
.setSmallIcon(R.drawable.ic_printservice)
+ .setContentText(mContext.getString(R.string.wifi_direct_problem))
.setStyle(new Notification.BigTextStyle().bigText(
- mContext.getString(R.string.wifi_direct_permission_rationale)))
+ mContext.getString(R.string.wifi_direct_problem)))
.setAutoCancel(true)
.setContentIntent(proceedPendingIntent)
.setDeleteIntent(cancelPendingIndent)
.addAction(fixAction)
- .addAction(cancelAction)
+ .addAction(disableAction)
.build();
mNotificationManager.notify(BuiltInPrintService.P2P_PERMISSION_REQUEST_ID, notification);
@@ -243,12 +273,12 @@ public class P2pPermissionManager {
return state;
}
- boolean hasPermission = hasP2pPermission();
- if (hasPermission && state != State.ALLOWED) {
+ boolean allowed = isLocationEnabled() && hasP2pPermission();
+ if (allowed && state != State.ALLOWED) {
// Upgrade state if now allowed
state = State.ALLOWED;
setState(state);
- } else if (!hasPermission && state == State.ALLOWED) {
+ } else if (!allowed && state == State.ALLOWED) {
state = State.DENIED;
setState(state);
}
@@ -256,6 +286,15 @@ public class P2pPermissionManager {
}
/**
+ * Return true if location services are enabled.
+ */
+ private boolean isLocationEnabled() {
+ LocationManager manager = (LocationManager) mContext.getSystemService(
+ Context.LOCATION_SERVICE);
+ return manager.isProviderEnabled(LocationManager.PASSIVE_PROVIDER);
+ }
+
+ /**
* Close any outstanding notification.
*/
void closeNotification() {
diff --git a/src/com/android/bips/ipp/StartJobTask.java b/src/com/android/bips/ipp/StartJobTask.java
index 807523a..36ae93e 100644
--- a/src/com/android/bips/ipp/StartJobTask.java
+++ b/src/com/android/bips/ipp/StartJobTask.java
@@ -50,7 +50,9 @@ class StartJobTask extends AsyncTask<Void, Void, Integer> {
private static final String MIME_TYPE_PDF = "application/pdf";
+ // see wprint_df_types.h for enum values
private static final int MEDIA_TYPE_PLAIN = 0;
+ private static final int MEDIA_TYPE_AUTO = 98;
// Unused but present
// private static final int MEDIA_TYPE_PHOTO = 1;
// private static final int MEDIA_TYPE_PHOTO_GLOSSY = 2;
@@ -224,13 +226,15 @@ class StartJobTask extends AsyncTask<Void, Void, Integer> {
private int getMediaType() {
int mediaType = MEDIA_TYPE_PLAIN;
-
- if (mDocInfo.getContentType() == PrintDocumentInfo.CONTENT_TYPE_PHOTO) {
- // Select the best (highest #) supported type for photos
- for (int supportedType : mCapabilities.supportedMediaTypes) {
- if (supportedType > mediaType) {
- mediaType = supportedType;
- }
+ for (int supportedType : mCapabilities.supportedMediaTypes) {
+ if (supportedType == MEDIA_TYPE_AUTO) {
+ // if auto media is supported, use that and break out of the loop
+ mediaType = MEDIA_TYPE_AUTO;
+ break;
+ } else if (mDocInfo.getContentType() == PrintDocumentInfo.CONTENT_TYPE_PHOTO
+ && supportedType > mediaType) {
+ // Select the best (highest #) supported type for photos
+ mediaType = supportedType;
}
}
return mediaType;
diff --git a/src/com/android/bips/jni/MediaSizes.java b/src/com/android/bips/jni/MediaSizes.java
index 4ec76f3..1efad5f 100644
--- a/src/com/android/bips/jni/MediaSizes.java
+++ b/src/com/android/bips/jni/MediaSizes.java
@@ -45,6 +45,20 @@ public class MediaSizes {
private static final String JIS_B5 = "jis_b5_182x257mm";
public static final String OE_PHOTO_L = "oe_photo-l_3.5x5in";
private static final String NA_GOVT_LETTER = "na_govt-letter_8x10in";
+ private static final String ISO_A0 = "iso_a0_841x1189mm";
+ private static final String ISO_A1 = "iso_a1_594x841mm";
+ private static final String ISO_A2 = "iso_a2_420x594mm";
+ private static final String ARCH_A = "na_arch-a_9x12in";
+ private static final String ARCH_B = "na_arch-b_12x18in";
+ private static final String ARCH_C = "na_arch-c_18x24in";
+ private static final String ARCH_D = "na_arch-d_24x36in";
+ private static final String ARCH_E = "na_arch-e_36x48in";
+ private static final String ARCH_E1 = "na_wide-format_30x42in";
+ private static final String ANSI_C = "na_c_17x22in";
+ private static final String ANSI_D = "na_d_22x34in";
+ private static final String ANSI_E = "na_e_34x44in";
+ private static final String ANSI_F = "asme_f_28x40in";
+ private static final String SUPER_B = "na_super-b_13x19in";
/** The backend string name for the default media size */
static final String DEFAULT_MEDIA_NAME = ISO_A4;
@@ -68,14 +82,28 @@ public class MediaSizes {
sCodeToStringMap.put(3, LEGAL);
sCodeToStringMap.put(7, NA_GOVT_LETTER);
sCodeToStringMap.put(11, NA_LEDGER_11X17);
+ sCodeToStringMap.put(12, ANSI_C);
+ sCodeToStringMap.put(13, ANSI_D);
+ sCodeToStringMap.put(14, ANSI_E);
+ sCodeToStringMap.put(16, SUPER_B);
sCodeToStringMap.put(25, ISO_A5);
sCodeToStringMap.put(26, ISO_A4);
sCodeToStringMap.put(27, ISO_A3);
+ sCodeToStringMap.put(28, ISO_A2);
+ sCodeToStringMap.put(29, ISO_A1);
+ sCodeToStringMap.put(30, ISO_A0);
sCodeToStringMap.put(45, JIS_B5);
sCodeToStringMap.put(46, JIS_B4);
sCodeToStringMap.put(71, JPN_HAGAKI);
sCodeToStringMap.put(74, PHOTO_4x6in);
sCodeToStringMap.put(122, PHOTO_5x7);
+ sCodeToStringMap.put(176, ARCH_A);
+ sCodeToStringMap.put(177, ARCH_B);
+ sCodeToStringMap.put(178, ARCH_C);
+ sCodeToStringMap.put(179, ARCH_D);
+ sCodeToStringMap.put(180, ARCH_E);
+ sCodeToStringMap.put(181, ARCH_E1);
+ sCodeToStringMap.put(182, ANSI_F);
sCodeToStringMap.put(302, OM_DSC_PHOTO);
sCodeToStringMap.put(303, OM_CARD);
sCodeToStringMap.put(304, OE_PHOTO_L);
@@ -93,6 +121,20 @@ public class MediaSizes {
mNameToSizeMap.put(JIS_B4, PrintAttributes.MediaSize.JIS_B4);
mNameToSizeMap.put(JIS_B5, PrintAttributes.MediaSize.JIS_B5);
mNameToSizeMap.put(NA_LEDGER_11X17, PrintAttributes.MediaSize.NA_TABLOID);
+ mNameToSizeMap.put(ISO_A0, PrintAttributes.MediaSize.ISO_A0);
+ mNameToSizeMap.put(ISO_A1, PrintAttributes.MediaSize.ISO_A1);
+ mNameToSizeMap.put(ISO_A2, PrintAttributes.MediaSize.ISO_A2);
+ mNameToSizeMap.put(ANSI_C, PrintAttributes.MediaSize.ANSI_C);
+ mNameToSizeMap.put(ANSI_D, PrintAttributes.MediaSize.ANSI_D);
+ mNameToSizeMap.put(ANSI_E, PrintAttributes.MediaSize.ANSI_E);
+ mNameToSizeMap.put(ANSI_F, PrintAttributes.MediaSize.ANSI_F);
+ mNameToSizeMap.put(ARCH_A, PrintAttributes.MediaSize.NA_ARCH_A);
+ mNameToSizeMap.put(ARCH_B, PrintAttributes.MediaSize.NA_ARCH_B);
+ mNameToSizeMap.put(ARCH_C, PrintAttributes.MediaSize.NA_ARCH_C);
+ mNameToSizeMap.put(ARCH_D, PrintAttributes.MediaSize.NA_ARCH_D);
+ mNameToSizeMap.put(ARCH_E, PrintAttributes.MediaSize.NA_ARCH_E);
+ mNameToSizeMap.put(ARCH_E1, PrintAttributes.MediaSize.NA_ARCH_E1);
+ mNameToSizeMap.put(SUPER_B, PrintAttributes.MediaSize.NA_SUPER_B);
// Custom media sizes
mNameToSizeMap.put(PHOTO_4x6in, new PrintAttributes.MediaSize(
diff --git a/src/com/android/bips/ui/AddPrintersFragment.java b/src/com/android/bips/ui/AddPrintersFragment.java
index e122cad..1bb3703 100644
--- a/src/com/android/bips/ui/AddPrintersFragment.java
+++ b/src/com/android/bips/ui/AddPrintersFragment.java
@@ -16,6 +16,7 @@
package com.android.bips.ui;
+import android.app.Activity;
import android.app.AlertDialog;
import android.content.ComponentName;
import android.content.Context;
@@ -96,8 +97,8 @@ public class AddPrintersFragment extends PreferenceFragment implements ServiceCo
mP2pPermissionManager.request(false, approve -> {
updateP2pPreferences();
if (!approve) {
- // The user is choosing to disable by denying Location.
- mP2pPermissionManager.setState(P2pPermissionManager.State.DISABLED);
+ // Try again next time
+ mP2pPermissionManager.setState(P2pPermissionManager.State.TEMPORARILY_DISABLED);
}
});
}
@@ -149,9 +150,11 @@ public class AddPrintersFragment extends PreferenceFragment implements ServiceCo
if (mP2pPermissionManager.isP2pEnabled()) {
mP2pEnablePreference.setChecked(true);
getPreferenceScreen().addPreference(mFindP2pPrintersPreference);
- if (getActivity().getIntent().getBooleanExtra(EXTRA_FIX_P2P_PERMISSION, false)) {
+ Activity activity = getActivity();
+ if (activity != null && activity.getIntent().getBooleanExtra(EXTRA_FIX_P2P_PERMISSION,
+ false)) {
// If we were only here to enable P2P permissions, go back to the print now.
- getActivity().finish();
+ activity.finish();
}
} else {
mP2pEnablePreference.setChecked(false);
diff --git a/src/com/android/bips/ui/MoreOptionsActivity.java b/src/com/android/bips/ui/MoreOptionsActivity.java
index d185ff3..a8fad76 100644
--- a/src/com/android/bips/ui/MoreOptionsActivity.java
+++ b/src/com/android/bips/ui/MoreOptionsActivity.java
@@ -28,6 +28,7 @@ import android.os.IBinder;
import android.print.PrintJobInfo;
import android.print.PrinterId;
import android.printservice.PrintService;
+import android.util.Log;
import android.view.MenuItem;
import com.android.bips.BuiltInPrintService;
@@ -41,17 +42,30 @@ import java.net.UnknownHostException;
* Launched by system in response to a "More Options" request while tracking a printer.
*/
public class MoreOptionsActivity extends Activity implements ServiceConnection, Discovery.Listener {
+ private static final String TAG = MoreOptionsActivity.class.getSimpleName();
+ private static final boolean DEBUG = false;
+
private BuiltInPrintService mPrintService;
PrinterId mPrinterId;
DiscoveredPrinter mPrinter;
InetAddress mPrinterAddress;
+ public static final String EXTRA_PRINTER_ID = "EXTRA_PRINTER_ID";
+
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
- PrintJobInfo jobInfo = getIntent().getParcelableExtra(PrintService.EXTRA_PRINT_JOB_INFO);
- mPrinterId = jobInfo.getPrinterId();
-
+ if (getIntent().hasExtra(PrintService.EXTRA_PRINT_JOB_INFO)) {
+ PrintJobInfo jobInfo =
+ getIntent().getParcelableExtra(PrintService.EXTRA_PRINT_JOB_INFO);
+ mPrinterId = jobInfo.getPrinterId();
+ } else if (getIntent().hasExtra(EXTRA_PRINTER_ID)) {
+ mPrinterId = getIntent().getParcelableExtra(EXTRA_PRINTER_ID);
+ } else {
+ if (DEBUG) Log.i(TAG, "No job info or printer info to show. Exiting.");
+ finish();
+ return;
+ }
ActionBar actionBar = getActionBar();
if (actionBar != null) {
actionBar.setDisplayHomeAsUpEnabled(true);