summaryrefslogtreecommitdiffstats
path: root/packages
diff options
context:
space:
mode:
Diffstat (limited to 'packages')
-rw-r--r--packages/DocumentsUI/res/drawable-hdpi/ic_drawer_glyph.pngbin390 -> 389 bytes
-rw-r--r--packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby_am.pngbin659 -> 574 bytes
-rw-r--r--packages/DocumentsUI/res/drawable-mdpi/ic_drawer_glyph.pngbin458 -> 385 bytes
-rw-r--r--packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby_am.pngbin594 -> 508 bytes
-rw-r--r--packages/DocumentsUI/res/drawable-xhdpi/ic_drawer_glyph.pngbin506 -> 409 bytes
-rw-r--r--packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby_am.pngbin731 -> 583 bytes
-rw-r--r--packages/DocumentsUI/res/drawable-xxhdpi/ic_drawer_glyph.pngbin203 -> 268 bytes
-rw-r--r--packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby_am.pngbin453 -> 373 bytes
-rw-r--r--packages/DocumentsUI/res/values-es-rUS/strings.xml3
-rw-r--r--packages/DocumentsUI/res/values-pt-rPT/strings.xml3
-rw-r--r--packages/DocumentsUI/res/values-ro/strings.xml3
-rw-r--r--packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java45
-rw-r--r--packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java10
-rw-r--r--packages/Keyguard/res/drawable-hdpi/kg_add_widget_pressed.pngbin1004 -> 3302 bytes
-rw-r--r--packages/Keyguard/res/drawable-mdpi/kg_add_widget_pressed.pngbin809 -> 3165 bytes
-rw-r--r--packages/Keyguard/res/drawable-xhdpi/kg_add_widget_pressed.pngbin1251 -> 3485 bytes
-rw-r--r--packages/Keyguard/res/values/strings.xml6
-rw-r--r--packages/Keyguard/src/com/android/keyguard/KeyguardWidgetFrame.java6
-rw-r--r--packages/Keyguard/src/com/android/keyguard/PagedView.java18
-rw-r--r--packages/PrintSpooler/res/values-af/strings.xml8
-rw-r--r--packages/PrintSpooler/res/values-am/strings.xml2
-rw-r--r--packages/PrintSpooler/res/values-ar/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-bg/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-ca/strings.xml6
-rw-r--r--packages/PrintSpooler/res/values-cs/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-da/strings.xml20
-rw-r--r--packages/PrintSpooler/res/values-de/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-el/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-en-rGB/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-en-rIN/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-es-rUS/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-fa/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-fr-rCA/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-fr/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-hr/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-hy-rAM/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-it/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-mn-rMN/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-nb/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-nl/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-pl/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-pt-rPT/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-pt/strings.xml6
-rw-r--r--packages/PrintSpooler/res/values-ro/strings.xml16
-rw-r--r--packages/PrintSpooler/res/values-sl/strings.xml14
-rw-r--r--packages/PrintSpooler/res/values-sr/strings.xml14
-rw-r--r--packages/PrintSpooler/res/values-sv/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-sw/strings.xml10
-rw-r--r--packages/PrintSpooler/res/values-tr/strings.xml2
-rw-r--r--packages/PrintSpooler/res/values-uk/strings.xml12
-rw-r--r--packages/PrintSpooler/res/values-zu/strings.xml12
-rw-r--r--packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java20
-rw-r--r--packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.pngbin1862 -> 2279 bytes
-rw-r--r--packages/SystemUI/res/drawable-hdpi/ic_qs_location_on.pngbin1762 -> 1354 bytes
-rw-r--r--packages/SystemUI/res/drawable-hdpi/recents_thumbnail_bg_press.9.pngbin326 -> 317 bytes
-rw-r--r--packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_off.pngbin1821 -> 2356 bytes
-rw-r--r--packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_off.pngbin1297 -> 1456 bytes
-rw-r--r--packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_off.pngbin2525 -> 3429 bytes
-rw-r--r--packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_airplane_off.pngbin2895 -> 4061 bytes
-rw-r--r--packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.pngbin1264 -> 1453 bytes
-rw-r--r--packages/SystemUI/res/drawable-mdpi/ic_qs_location_on.pngbin1139 -> 937 bytes
-rw-r--r--packages/SystemUI/res/drawable-mdpi/recents_thumbnail_bg_press.9.pngbin284 -> 274 bytes
-rw-r--r--packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.pngbin2492 -> 3408 bytes
-rw-r--r--packages/SystemUI/res/drawable-xhdpi/ic_qs_location_on.pngbin2360 -> 1768 bytes
-rw-r--r--packages/SystemUI/res/drawable-xhdpi/recents_thumbnail_bg_press.9.pngbin413 -> 406 bytes
-rw-r--r--packages/SystemUI/res/drawable-xxhdpi/ic_qs_airplane_off.pngbin2926 -> 4073 bytes
-rw-r--r--packages/SystemUI/res/drawable-xxhdpi/ic_qs_location_on.pngbin2883 -> 2441 bytes
-rw-r--r--packages/SystemUI/res/drawable-xxhdpi/recents_thumbnail_bg_press.9.pngbin1350 -> 1343 bytes
-rw-r--r--packages/SystemUI/res/layout/quick_settings_tile_rssi.xml1
-rw-r--r--packages/SystemUI/res/values-mcc262-mnc07/config.xml26
-rw-r--r--packages/SystemUI/res/values/config.xml3
71 files changed, 233 insertions, 273 deletions
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_drawer_glyph.png b/packages/DocumentsUI/res/drawable-hdpi/ic_drawer_glyph.png
index 053c0b8..251ecfb 100644
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_drawer_glyph.png
+++ b/packages/DocumentsUI/res/drawable-hdpi/ic_drawer_glyph.png
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby_am.png b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby_am.png
index 78638f7..0d4cdc1 100644
--- a/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby_am.png
+++ b/packages/DocumentsUI/res/drawable-hdpi/ic_menu_sortby_am.png
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_drawer_glyph.png b/packages/DocumentsUI/res/drawable-mdpi/ic_drawer_glyph.png
index f616d3b..ae0da34 100644
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_drawer_glyph.png
+++ b/packages/DocumentsUI/res/drawable-mdpi/ic_drawer_glyph.png
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby_am.png b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby_am.png
index 2155d02..2768b1c 100644
--- a/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby_am.png
+++ b/packages/DocumentsUI/res/drawable-mdpi/ic_menu_sortby_am.png
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_drawer_glyph.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_drawer_glyph.png
index 002ccd9..7402c6d 100644
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_drawer_glyph.png
+++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_drawer_glyph.png
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby_am.png b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby_am.png
index 85c8734..f24ca1a 100644
--- a/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby_am.png
+++ b/packages/DocumentsUI/res/drawable-xhdpi/ic_menu_sortby_am.png
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_drawer_glyph.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_drawer_glyph.png
index adee4a3..4160699 100644
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_drawer_glyph.png
+++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_drawer_glyph.png
Binary files differ
diff --git a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby_am.png b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby_am.png
index 867c8e8..8f19afa 100644
--- a/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby_am.png
+++ b/packages/DocumentsUI/res/drawable-xxhdpi/ic_menu_sortby_am.png
Binary files differ
diff --git a/packages/DocumentsUI/res/values-es-rUS/strings.xml b/packages/DocumentsUI/res/values-es-rUS/strings.xml
index 9e185a0..31ed469 100644
--- a/packages/DocumentsUI/res/values-es-rUS/strings.xml
+++ b/packages/DocumentsUI/res/values-es-rUS/strings.xml
@@ -36,8 +36,7 @@
<string name="drawer_open" msgid="4545466532430226949">"Mostrar raíces"</string>
<string name="drawer_close" msgid="7602734368552123318">"Ocultar raíces"</string>
<string name="save_error" msgid="6167009778003223664">"Error al guardar el documento"</string>
- <!-- no translation found for create_error (3735649141335444215) -->
- <skip />
+ <string name="create_error" msgid="3735649141335444215">"Error al crear la carpeta"</string>
<string name="root_recent" msgid="4470053704320518133">"Recientes"</string>
<string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> de espacio libre"</string>
<string name="root_type_service" msgid="2178854894416775409">"Almacenamiento"</string>
diff --git a/packages/DocumentsUI/res/values-pt-rPT/strings.xml b/packages/DocumentsUI/res/values-pt-rPT/strings.xml
index 4a75ae7..25b055d 100644
--- a/packages/DocumentsUI/res/values-pt-rPT/strings.xml
+++ b/packages/DocumentsUI/res/values-pt-rPT/strings.xml
@@ -36,8 +36,7 @@
<string name="drawer_open" msgid="4545466532430226949">"Mostrar raízes"</string>
<string name="drawer_close" msgid="7602734368552123318">"Ocultar raízes"</string>
<string name="save_error" msgid="6167009778003223664">"Falha ao guardar o documento"</string>
- <!-- no translation found for create_error (3735649141335444215) -->
- <skip />
+ <string name="create_error" msgid="3735649141335444215">"Falha ao criar a pasta"</string>
<string name="root_recent" msgid="4470053704320518133">"Recentes"</string>
<string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> espaço livre"</string>
<string name="root_type_service" msgid="2178854894416775409">"Serv. de armazenamento"</string>
diff --git a/packages/DocumentsUI/res/values-ro/strings.xml b/packages/DocumentsUI/res/values-ro/strings.xml
index b50b1d5..e672198 100644
--- a/packages/DocumentsUI/res/values-ro/strings.xml
+++ b/packages/DocumentsUI/res/values-ro/strings.xml
@@ -36,8 +36,7 @@
<string name="drawer_open" msgid="4545466532430226949">"Afișați directoarele rădăcină"</string>
<string name="drawer_close" msgid="7602734368552123318">"Ascundeți directoarele rădăcină"</string>
<string name="save_error" msgid="6167009778003223664">"Salvarea documentului nu a reușit"</string>
- <!-- no translation found for create_error (3735649141335444215) -->
- <skip />
+ <string name="create_error" msgid="3735649141335444215">"Eroare la crearea dosarului"</string>
<string name="root_recent" msgid="4470053704320518133">"Recente"</string>
<string name="root_available_bytes" msgid="8568452858617033281">"<xliff:g id="SIZE">%1$s</xliff:g> spațiu liber"</string>
<string name="root_type_service" msgid="2178854894416775409">"Servicii de stocare"</string>
diff --git a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
index 79ab28d..138f523 100644
--- a/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
+++ b/packages/DocumentsUI/src/com/android/documentsui/DirectoryFragment.java
@@ -77,7 +77,6 @@ import com.android.documentsui.DocumentsActivity.State;
import com.android.documentsui.RecentsProvider.StateColumns;
import com.android.documentsui.model.DocumentInfo;
import com.android.documentsui.model.RootInfo;
-import com.android.internal.util.Predicate;
import com.google.android.collect.Lists;
import java.util.ArrayList;
@@ -95,8 +94,6 @@ public class DirectoryFragment extends Fragment {
private AbsListView mCurrentView;
- private Predicate<DocumentInfo> mFilter;
-
public static final int TYPE_NORMAL = 1;
public static final int TYPE_SEARCH = 2;
public static final int TYPE_RECENT_OPEN = 3;
@@ -354,8 +351,6 @@ public class DirectoryFragment extends Fragment {
private void updateDisplayState() {
final State state = getDisplayState(this);
- mFilter = new MimePredicate(state.acceptMimes);
-
if (mLastMode == state.derivedMode && mLastShowSize == state.showSize) return;
mLastMode = state.derivedMode;
mLastShowSize = state.showSize;
@@ -399,8 +394,10 @@ public class DirectoryFragment extends Fragment {
public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
final Cursor cursor = mAdapter.getItem(position);
if (cursor != null) {
- final DocumentInfo doc = DocumentInfo.fromDirectoryCursor(cursor);
- if (mFilter.apply(doc)) {
+ final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
+ final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
+ if (isDocumentEnabled(docMimeType, docFlags)) {
+ final DocumentInfo doc = DocumentInfo.fromDirectoryCursor(cursor);
((DocumentsActivity) getActivity()).onDocumentPicked(doc);
}
}
@@ -479,11 +476,10 @@ public class DirectoryFragment extends Fragment {
final Cursor cursor = mAdapter.getItem(position);
if (cursor != null) {
final String docMimeType = getCursorString(cursor, Document.COLUMN_MIME_TYPE);
-
- // Only valid if non-directory matches filter
- final State state = getDisplayState(DirectoryFragment.this);
- valid = !Document.MIME_TYPE_DIR.equals(docMimeType)
- && MimePredicate.mimeMatches(state.acceptMimes, docMimeType);
+ final int docFlags = getCursorInt(cursor, Document.COLUMN_FLAGS);
+ if (!Document.MIME_TYPE_DIR.equals(docMimeType)) {
+ valid = isDocumentEnabled(docMimeType, docFlags);
+ }
}
if (!valid) {
@@ -896,14 +892,7 @@ public class DirectoryFragment extends Fragment {
line2.setVisibility(hasLine2 ? View.VISIBLE : View.GONE);
}
- boolean enabled = Document.MIME_TYPE_DIR.equals(docMimeType)
- || MimePredicate.mimeMatches(state.acceptMimes, docMimeType);
-
- // Read-only files aren't actually enabled when creating
- if (state.action == ACTION_CREATE && (docFlags & Document.FLAG_SUPPORTS_WRITE) == 0) {
- enabled = false;
- }
-
+ final boolean enabled = isDocumentEnabled(docMimeType, docFlags);
if (enabled) {
setEnabledRecursive(convertView, true);
icon.setAlpha(1f);
@@ -1067,4 +1056,20 @@ public class DirectoryFragment extends Fragment {
}
}
}
+
+ private boolean isDocumentEnabled(String docMimeType, int docFlags) {
+ final State state = getDisplayState(DirectoryFragment.this);
+
+ // Read-only files are disabled when creating
+ if (state.action == ACTION_CREATE && (docFlags & Document.FLAG_SUPPORTS_WRITE) == 0) {
+ return false;
+ }
+
+ // Directories are always enabled
+ if (Document.MIME_TYPE_DIR.equals(docMimeType)) {
+ return true;
+ }
+
+ return MimePredicate.mimeMatches(state.acceptMimes, docMimeType);
+ }
}
diff --git a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
index 0ef5f56..ed28da5 100644
--- a/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
+++ b/packages/ExternalStorageProvider/src/com/android/externalstorage/ExternalStorageProvider.java
@@ -16,7 +16,6 @@
package com.android.externalstorage;
-import android.content.ContentResolver;
import android.content.res.AssetFileDescriptor;
import android.database.Cursor;
import android.database.MatrixCursor;
@@ -166,11 +165,12 @@ public class ExternalStorageProvider extends DocumentsProvider {
int flags = 0;
- if (file.isDirectory() && file.canWrite()) {
- flags |= Document.FLAG_DIR_SUPPORTS_CREATE;
- }
if (file.canWrite()) {
- flags |= Document.FLAG_SUPPORTS_WRITE;
+ if (file.isDirectory()) {
+ flags |= Document.FLAG_DIR_SUPPORTS_CREATE;
+ } else {
+ flags |= Document.FLAG_SUPPORTS_WRITE;
+ }
flags |= Document.FLAG_SUPPORTS_DELETE;
}
diff --git a/packages/Keyguard/res/drawable-hdpi/kg_add_widget_pressed.png b/packages/Keyguard/res/drawable-hdpi/kg_add_widget_pressed.png
index 55112ca..70a960d 100644
--- a/packages/Keyguard/res/drawable-hdpi/kg_add_widget_pressed.png
+++ b/packages/Keyguard/res/drawable-hdpi/kg_add_widget_pressed.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable-mdpi/kg_add_widget_pressed.png b/packages/Keyguard/res/drawable-mdpi/kg_add_widget_pressed.png
index 34a7aaa..a68d4c1 100644
--- a/packages/Keyguard/res/drawable-mdpi/kg_add_widget_pressed.png
+++ b/packages/Keyguard/res/drawable-mdpi/kg_add_widget_pressed.png
Binary files differ
diff --git a/packages/Keyguard/res/drawable-xhdpi/kg_add_widget_pressed.png b/packages/Keyguard/res/drawable-xhdpi/kg_add_widget_pressed.png
index 4b86727..edf7070 100644
--- a/packages/Keyguard/res/drawable-xhdpi/kg_add_widget_pressed.png
+++ b/packages/Keyguard/res/drawable-xhdpi/kg_add_widget_pressed.png
Binary files differ
diff --git a/packages/Keyguard/res/values/strings.xml b/packages/Keyguard/res/values/strings.xml
index ba6685a..89e7240 100644
--- a/packages/Keyguard/res/values/strings.xml
+++ b/packages/Keyguard/res/values/strings.xml
@@ -157,6 +157,12 @@
<!-- Accessibility description for when the bouncer prompt is dismissed. [CHAR LIMIT=NONE] -->
<string name="keyguard_accessibility_hide_bouncer">Launch canceled</string>
+ <!-- Accessibility description announced when user drags widget over the delete drop target [CHAR LIMIT=NONE] -->
+ <string name="keyguard_accessibility_delete_widget_start">Drop <xliff:g id="widget_index">%1$s</xliff:g> to delete.</string>
+
+ <!-- Accessibility description announced when user drags widget away from delete drop target [CHAR LIMIT=NONE] -->
+ <string name="keyguard_accessibility_delete_widget_end"><xliff:g id="widget_index">%1$s</xliff:g> will not be deleted.</string>
+
<!-- Password keyboard strings. Used by LockScreen and Settings --><skip />
<!-- Label for "switch to symbols" key. Must be short to fit on key! -->
<string name="password_keyboard_label_symbol_key">\?123</string>
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetFrame.java b/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetFrame.java
index 81f6221..c0586d5 100644
--- a/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetFrame.java
+++ b/packages/Keyguard/src/com/android/keyguard/KeyguardWidgetFrame.java
@@ -147,6 +147,10 @@ public class KeyguardWidgetFrame extends FrameLayout {
if (ENABLE_HOVER_OVER_DELETE_DROP_TARGET_OVERLAY) {
if (mIsHoveringOverDeleteDropTarget != isHovering) {
mIsHoveringOverDeleteDropTarget = isHovering;
+ int resId = isHovering ? R.string.keyguard_accessibility_delete_widget_start
+ : R.string.keyguard_accessibility_delete_widget_end;
+ String text = getContext().getResources().getString(resId, getContentDescription());
+ announceForAccessibility(text);
invalidate();
}
}
@@ -326,7 +330,7 @@ public class KeyguardWidgetFrame extends FrameLayout {
/**
* Depending on whether the security is up, the widget size needs to change
- *
+ *
* @param height The height of the widget, -1 for full height
*/
private void setWidgetHeight(int height) {
diff --git a/packages/Keyguard/src/com/android/keyguard/PagedView.java b/packages/Keyguard/src/com/android/keyguard/PagedView.java
index b6279d0..666227c 100644
--- a/packages/Keyguard/src/com/android/keyguard/PagedView.java
+++ b/packages/Keyguard/src/com/android/keyguard/PagedView.java
@@ -125,6 +125,7 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
private int[] mChildOffsets;
private int[] mChildRelativeOffsets;
private int[] mChildOffsetsWithLayoutScale;
+ private String mDeleteString; // Accessibility announcement when widget is deleted
protected final static int TOUCH_STATE_REST = 0;
protected final static int TOUCH_STATE_SCROLLING = 1;
@@ -1118,6 +1119,8 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
// i.e. fall through to the next case (don't break)
// (We sometimes miss ACTION_DOWN events in Workspace because it ignores all events
// while it's small- this was causing a crash before we checked for INVALID_POINTER)
+
+ break;
}
case MotionEvent.ACTION_DOWN: {
@@ -2194,8 +2197,13 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
protected void onEndReordering() {
if (AccessibilityManager.getInstance(mContext).isEnabled()) {
- announceForAccessibility(mContext.getString(
- R.string.keyguard_accessibility_widget_reorder_end));
+ if (mDeleteString != null) {
+ announceForAccessibility(mDeleteString);
+ mDeleteString = null;
+ } else {
+ announceForAccessibility(mContext.getString(
+ R.string.keyguard_accessibility_widget_reorder_end));
+ }
}
mIsReordering = false;
@@ -2507,6 +2515,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
AnimatorUpdateListener updateCb = new FlingAlongVectorAnimatorUpdateListener(dragView, vel,
from, startTime, FLING_TO_DELETE_FRICTION);
+ mDeleteString = getContext().getResources()
+ .getString(R.string.keyguard_accessibility_widget_deleted,
+ mDragView.getContentDescription());
final Runnable onAnimationEndRunnable = createPostDeleteAnimationRunnable(dragView);
// Create and start the animation
@@ -2562,6 +2573,9 @@ public abstract class PagedView extends ViewGroup implements ViewGroup.OnHierarc
ObjectAnimator.ofFloat(dragView, "alpha", toAlpha));
animations.add(alphaAnim);
+ mDeleteString = getContext().getResources()
+ .getString(R.string.keyguard_accessibility_widget_deleted,
+ mDragView.getContentDescription());
final Runnable onAnimationEndRunnable = createPostDeleteAnimationRunnable(dragView);
AnimatorSet anim = new AnimatorSet();
diff --git a/packages/PrintSpooler/res/values-af/strings.xml b/packages/PrintSpooler/res/values-af/strings.xml
index a5552f0..84ff076 100644
--- a/packages/PrintSpooler/res/values-af/strings.xml
+++ b/packages/PrintSpooler/res/values-af/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="4469836075319831821">"Drukspooler"</string>
+ <string name="app_label" msgid="4469836075319831821">"Drukwaglys"</string>
<string name="print_button" msgid="645164566271246268">"Druk"</string>
<string name="save_button" msgid="1921310454071758999">"Stoor"</string>
<string name="label_destination" msgid="9132510997381599275">"Bestemming"</string>
@@ -31,7 +31,7 @@
<string name="pages_range_example" msgid="4069269138547562081">"bv. 1-5, 8, 11-13"</string>
<string name="print_preview" msgid="8010217796057763343">"Drukvoorskou"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Installeer PDF-bekyker vir voorskou"</string>
- <string name="printing_app_crashed" msgid="854477616686566398">"Drukker-program het omgeval"</string>
+ <string name="printing_app_crashed" msgid="854477616686566398">"Drukkerprogram het omgeval"</string>
<!-- no translation found for page_count_unknown (7412881437770983864) -->
<skip />
<string name="generating_print_job" msgid="3119608742651698916">"Genereer uitdruktaak"</string>
@@ -41,8 +41,8 @@
<string name="all_printers_label" msgid="3178848870161526399">"Alle drukkers"</string>
<string name="choose_print_service" msgid="3740309762324459694">"Kies drukdiens"</string>
<string name="search_play_store" msgid="1575218005860538249">"Soek in Play-winkel"</string>
- <string name="printing_notification_title_template" msgid="295903957762447362">"Druk <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
- <string name="cancelling_notification_title_template" msgid="1821759594704703197">"Kanselleer <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+ <string name="printing_notification_title_template" msgid="295903957762447362">"Druk tans <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
+ <string name="cancelling_notification_title_template" msgid="1821759594704703197">"Kanselleer tans <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="failed_notification_title_template" msgid="2256217208186530973">"Drukkerfout by <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="blocked_notification_title_template" msgid="1175435827331588646">"Drukker het <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> geblokkeer"</string>
<string name="cancel" msgid="4373674107267141885">"Kanselleer"</string>
diff --git a/packages/PrintSpooler/res/values-am/strings.xml b/packages/PrintSpooler/res/values-am/strings.xml
index b8d7d91..4c3012e 100644
--- a/packages/PrintSpooler/res/values-am/strings.xml
+++ b/packages/PrintSpooler/res/values-am/strings.xml
@@ -45,7 +45,7 @@
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ን በመተው ላይ"</string>
<string name="failed_notification_title_template" msgid="2256217208186530973">"የአታሚ ስህተት <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="blocked_notification_title_template" msgid="1175435827331588646">"አታሚ <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>ን አግዷል"</string>
- <string name="cancel" msgid="4373674107267141885">"ይቅር"</string>
+ <string name="cancel" msgid="4373674107267141885">"ሰርዝ"</string>
<string name="restart" msgid="2472034227037808749">"እንደገና ጀምር"</string>
<string name="no_connection_to_printer" msgid="2159246915977282728">"ከአታሚ ጋር ምንም ግንኙነት የለም"</string>
<string name="reason_unknown" msgid="5507940196503246139">"አይታወቅም"</string>
diff --git a/packages/PrintSpooler/res/values-ar/strings.xml b/packages/PrintSpooler/res/values-ar/strings.xml
index f7aa143..eb9c06e 100644
--- a/packages/PrintSpooler/res/values-ar/strings.xml
+++ b/packages/PrintSpooler/res/values-ar/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"حفظ"</string>
<string name="label_destination" msgid="9132510997381599275">"الوجهة"</string>
<string name="label_copies" msgid="3634531042822968308">"عدد النسخ"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"حجم الورق"</string>
+ <string name="label_color" msgid="1108690305218188969">"اللون"</string>
<string name="label_orientation" msgid="2853142581990496477">"الاتجاه"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"الصفحات (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"مثل 1–5، 8، 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"معاينة قبل الطباعة"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"تثبيت برنامج عرض PDF للمعاينة"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"تعطّل تطبيق الطباعة"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"غير متوفر"</string>
<string name="generating_print_job" msgid="3119608742651698916">"جارٍ إنشاء مهمة الطباعة"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"حفظ بتنسيق PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"جميع الطابعات…"</string>
diff --git a/packages/PrintSpooler/res/values-bg/strings.xml b/packages/PrintSpooler/res/values-bg/strings.xml
index 795025d..5207e42 100644
--- a/packages/PrintSpooler/res/values-bg/strings.xml
+++ b/packages/PrintSpooler/res/values-bg/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Запазване"</string>
<string name="label_destination" msgid="9132510997381599275">"Местоназначение"</string>
<string name="label_copies" msgid="3634531042822968308">"Копия"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Размер на хартията"</string>
+ <string name="label_color" msgid="1108690305218188969">"Цвят"</string>
<string name="label_orientation" msgid="2853142581990496477">"Ориентация"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Страници (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"напр. 1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Визуализация за печат"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Инсталиране на визуализатор на PDF"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Получи се срив в приложението за отпечатване"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"няма информация"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Заданието за печат се генерира"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Запазване като PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Всички принтери…"</string>
diff --git a/packages/PrintSpooler/res/values-ca/strings.xml b/packages/PrintSpooler/res/values-ca/strings.xml
index 45c5d12..3ef42ac 100644
--- a/packages/PrintSpooler/res/values-ca/strings.xml
+++ b/packages/PrintSpooler/res/values-ca/strings.xml
@@ -35,7 +35,7 @@
<string name="all_printers" msgid="5018829726861876202">"Totes les impressores…"</string>
<string name="search" msgid="5421724265322228497">"Cerca"</string>
<string name="all_printers_label" msgid="3178848870161526399">"Totes les impressores"</string>
- <string name="choose_print_service" msgid="3740309762324459694">"Tria del servei d\'impressió"</string>
+ <string name="choose_print_service" msgid="3740309762324459694">"Selecció del servei d\'impressió"</string>
<string name="search_play_store" msgid="1575218005860538249">"Cerca a Play Store"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"S\'està imprimint <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"S\'està cancel·lant <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
@@ -50,8 +50,8 @@
<item msgid="2762241247228983754">"Color"</item>
</string-array>
<string-array name="orientation_labels">
- <item msgid="4061931020926489228">"Retrat"</item>
- <item msgid="3199660090246166812">"Paisatge"</item>
+ <item msgid="4061931020926489228">"Vertical"</item>
+ <item msgid="3199660090246166812">"Horitzontal"</item>
</string-array>
<string-array name="page_options_labels">
<item msgid="7421377442011699994">"Tots"</item>
diff --git a/packages/PrintSpooler/res/values-cs/strings.xml b/packages/PrintSpooler/res/values-cs/strings.xml
index 08d096f..354f1d5 100644
--- a/packages/PrintSpooler/res/values-cs/strings.xml
+++ b/packages/PrintSpooler/res/values-cs/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Uložit"</string>
<string name="label_destination" msgid="9132510997381599275">"Cíl"</string>
<string name="label_copies" msgid="3634531042822968308">"Kopie"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Velikost papíru"</string>
+ <string name="label_color" msgid="1108690305218188969">"Barva"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientace"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"STRÁNKY (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"např. 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Náhled tisku"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Nainstalovat prohlížeč PDF (umožní náhled)"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Aplikace tisku selhala"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"nedostupné"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Generování úlohy tisku"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Uložit ve formátu PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Všechny tiskárny…"</string>
diff --git a/packages/PrintSpooler/res/values-da/strings.xml b/packages/PrintSpooler/res/values-da/strings.xml
index f8015e3..c749fd9 100644
--- a/packages/PrintSpooler/res/values-da/strings.xml
+++ b/packages/PrintSpooler/res/values-da/strings.xml
@@ -16,34 +16,30 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="4469836075319831821">"Udskrivningsspooler"</string>
+ <string name="app_label" msgid="4469836075319831821">"Print Spooler"</string>
<string name="print_button" msgid="645164566271246268">"Udskriv"</string>
<string name="save_button" msgid="1921310454071758999">"Gem"</string>
<string name="label_destination" msgid="9132510997381599275">"Destination"</string>
<string name="label_copies" msgid="3634531042822968308">"Kopier"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Papirstørrelse"</string>
+ <string name="label_color" msgid="1108690305218188969">"Farve"</string>
<string name="label_orientation" msgid="2853142581990496477">"Retning"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Sider (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"f.eks. 1-5, 8, 11-13"</string>
<string name="print_preview" msgid="8010217796057763343">"Vis udskrift"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Installer et PDF-visningsprog. for at se eksempel"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Udskrivningsapp gik ned"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
- <string name="generating_print_job" msgid="3119608742651698916">"Udskriftsjob generes"</string>
+ <string name="page_count_unknown" msgid="7412881437770983864">"utilgængelig"</string>
+ <string name="generating_print_job" msgid="3119608742651698916">"Udskriften generes"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Gem som PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Alle printere..."</string>
<string name="search" msgid="5421724265322228497">"Søg"</string>
<string name="all_printers_label" msgid="3178848870161526399">"Alle printere"</string>
- <string name="choose_print_service" msgid="3740309762324459694">"Vælg printtjeneste"</string>
+ <string name="choose_print_service" msgid="3740309762324459694">"Vælg udskriftstjeneste"</string>
<string name="search_play_store" msgid="1575218005860538249">"Søg i Play Butik"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> udskrives"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"<xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> annulleres"</string>
- <string name="failed_notification_title_template" msgid="2256217208186530973">"Printjob <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> mislykkedes"</string>
+ <string name="failed_notification_title_template" msgid="2256217208186530973">"Udskriften <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g> mislykkedes"</string>
<string name="blocked_notification_title_template" msgid="1175435827331588646">"Printeren har blokeret <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancel" msgid="4373674107267141885">"Annuller"</string>
<string name="restart" msgid="2472034227037808749">"Genstart"</string>
diff --git a/packages/PrintSpooler/res/values-de/strings.xml b/packages/PrintSpooler/res/values-de/strings.xml
index 08e294e..13dac37 100644
--- a/packages/PrintSpooler/res/values-de/strings.xml
+++ b/packages/PrintSpooler/res/values-de/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Speichern"</string>
<string name="label_destination" msgid="9132510997381599275">"Ziel"</string>
<string name="label_copies" msgid="3634531042822968308">"Exemplare"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Papiergröße"</string>
+ <string name="label_color" msgid="1108690305218188969">"Farbe"</string>
<string name="label_orientation" msgid="2853142581990496477">"Ausrichtung"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Seiten (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"z. B. 1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Vorschau drucken"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"PDF-Viewer für Vorschau installieren"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Druck-App abgestürzt"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"nicht verfügbar"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Druckauftrag wird generiert..."</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Als PDF speichern"</string>
<string name="all_printers" msgid="5018829726861876202">"Alle Drucker…"</string>
diff --git a/packages/PrintSpooler/res/values-el/strings.xml b/packages/PrintSpooler/res/values-el/strings.xml
index 33edc02..d792d86 100644
--- a/packages/PrintSpooler/res/values-el/strings.xml
+++ b/packages/PrintSpooler/res/values-el/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Αποθήκευση"</string>
<string name="label_destination" msgid="9132510997381599275">"Προορισμός"</string>
<string name="label_copies" msgid="3634531042822968308">"Αντίγραφα"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Μέγεθος χαρτιού"</string>
+ <string name="label_color" msgid="1108690305218188969">"Χρώμα"</string>
<string name="label_orientation" msgid="2853142581990496477">"Προσανατολισμός"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Σελίδες (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"π.χ. 1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Προεπισκόπηση εκτύπωσης"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Εγκαταστήστε το PDF viewer για προεπισκόπηση"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Διακοπή λειτουργίας εφαρμογής εκτύπωσης"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"μη διαθέσιμο"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Δημιουργία εργασίας εκτύπωσης"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Αποθήκευση ως PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Όλοι οι εκτυπωτές…"</string>
diff --git a/packages/PrintSpooler/res/values-en-rGB/strings.xml b/packages/PrintSpooler/res/values-en-rGB/strings.xml
index 79df9a1..f04a298 100644
--- a/packages/PrintSpooler/res/values-en-rGB/strings.xml
+++ b/packages/PrintSpooler/res/values-en-rGB/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Save"</string>
<string name="label_destination" msgid="9132510997381599275">"Destination"</string>
<string name="label_copies" msgid="3634531042822968308">"Copies"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Paper Size"</string>
+ <string name="label_color" msgid="1108690305218188969">"Colour"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Pages (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"e.g. 1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Print preview"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Install PDF viewer for preview"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Printing app crashed"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"unavailable"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Generating print job"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Save as PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"All printers…"</string>
diff --git a/packages/PrintSpooler/res/values-en-rIN/strings.xml b/packages/PrintSpooler/res/values-en-rIN/strings.xml
index 79df9a1..f04a298 100644
--- a/packages/PrintSpooler/res/values-en-rIN/strings.xml
+++ b/packages/PrintSpooler/res/values-en-rIN/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Save"</string>
<string name="label_destination" msgid="9132510997381599275">"Destination"</string>
<string name="label_copies" msgid="3634531042822968308">"Copies"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Paper Size"</string>
+ <string name="label_color" msgid="1108690305218188969">"Colour"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Pages (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"e.g. 1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Print preview"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Install PDF viewer for preview"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Printing app crashed"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"unavailable"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Generating print job"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Save as PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"All printers…"</string>
diff --git a/packages/PrintSpooler/res/values-es-rUS/strings.xml b/packages/PrintSpooler/res/values-es-rUS/strings.xml
index 1f9314b..13fe4ec 100644
--- a/packages/PrintSpooler/res/values-es-rUS/strings.xml
+++ b/packages/PrintSpooler/res/values-es-rUS/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Guardar"</string>
<string name="label_destination" msgid="9132510997381599275">"Destino"</string>
<string name="label_copies" msgid="3634531042822968308">"Copias"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Tamaño del papel"</string>
+ <string name="label_color" msgid="1108690305218188969">"Color"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientación"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Páginas (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"p. ej.: 1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Vista previa de impresión"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Instalar visualizador de PDF para vista previa"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"La aplicación de impresión falló"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"no disponible"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Generando trabajo de impresión"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Guardar como PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Todas las impresoras…"</string>
diff --git a/packages/PrintSpooler/res/values-fa/strings.xml b/packages/PrintSpooler/res/values-fa/strings.xml
index f0b922a..b0e84b7 100644
--- a/packages/PrintSpooler/res/values-fa/strings.xml
+++ b/packages/PrintSpooler/res/values-fa/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"ذخیره"</string>
<string name="label_destination" msgid="9132510997381599275">"مقصد"</string>
<string name="label_copies" msgid="3634531042822968308">"کپی‌ها"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"اندازه کاغذ"</string>
+ <string name="label_color" msgid="1108690305218188969">"رنگی"</string>
<string name="label_orientation" msgid="2853142581990496477">"جهت"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"صفحات (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"به عنوان مثال، ۵-۱، ۸، ۱۳-۱۱"</string>
<string name="print_preview" msgid="8010217796057763343">"پیش‌نمایش چاپ"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"نصب نمایشگر PDF برای پیش‌نمایش"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"برنامه چاپ خراب شد"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"در دسترس نیست"</string>
<string name="generating_print_job" msgid="3119608742651698916">"در حال ایجاد کار چاپ"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"ذخیره به‌عنوان PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"همه چاپگرها..."</string>
diff --git a/packages/PrintSpooler/res/values-fr-rCA/strings.xml b/packages/PrintSpooler/res/values-fr-rCA/strings.xml
index 6c72a4a..9a422f2 100644
--- a/packages/PrintSpooler/res/values-fr-rCA/strings.xml
+++ b/packages/PrintSpooler/res/values-fr-rCA/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Enregistrer"</string>
<string name="label_destination" msgid="9132510997381599275">"Destination"</string>
<string name="label_copies" msgid="3634531042822968308">"Copies"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Format du papier"</string>
+ <string name="label_color" msgid="1108690305218188969">"Couleur"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"PAGES (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"p.ex. 1-5, 8, 11-13"</string>
<string name="print_preview" msgid="8010217796057763343">"Aperçu avant impression"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Installer un lecteur PDF pour voir l\'aperçu"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"L\'application à l\'origine de l\'impression a planté"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"non offert"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Génération tâche impression…"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Enregistrer en format PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Toutes les imprimantes…"</string>
diff --git a/packages/PrintSpooler/res/values-fr/strings.xml b/packages/PrintSpooler/res/values-fr/strings.xml
index 6b57fa7..1937634 100644
--- a/packages/PrintSpooler/res/values-fr/strings.xml
+++ b/packages/PrintSpooler/res/values-fr/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Enregistrer"</string>
<string name="label_destination" msgid="9132510997381599275">"Destination"</string>
<string name="label_copies" msgid="3634531042822968308">"Copies"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Format du papier"</string>
+ <string name="label_color" msgid="1108690305218188969">"Couleur"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientation"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Pages (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"ex. : 1-5, 8, 11-13"</string>
<string name="print_preview" msgid="8010217796057763343">"Aperçu avant impression"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Installer un lecteur PDF pour afficher l\'aperçu"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"L\'application à l\'origine de l\'impression a planté"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"non disponible"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Génération tâche impression…"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Enregistrer au format .PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Toutes les imprimantes…"</string>
diff --git a/packages/PrintSpooler/res/values-hr/strings.xml b/packages/PrintSpooler/res/values-hr/strings.xml
index 63e8aa8..9789938 100644
--- a/packages/PrintSpooler/res/values-hr/strings.xml
+++ b/packages/PrintSpooler/res/values-hr/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Spremi"</string>
<string name="label_destination" msgid="9132510997381599275">"Odredište"</string>
<string name="label_copies" msgid="3634531042822968308">"Kopije"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Veličina papira"</string>
+ <string name="label_color" msgid="1108690305218188969">"U boji"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orijentacija"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Stranice (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"npr., 1–5, 8"</string>
<string name="print_preview" msgid="8010217796057763343">"Pregled ispisa"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Instaliraj PDF preglednik za pregled"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Srušila se aplikacija za ispis"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"nedostupno"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Generiranje zadatka ispisa"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Spremi kao PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Svi pisači…"</string>
diff --git a/packages/PrintSpooler/res/values-hy-rAM/strings.xml b/packages/PrintSpooler/res/values-hy-rAM/strings.xml
index 62a6e4d..b3499b3 100644
--- a/packages/PrintSpooler/res/values-hy-rAM/strings.xml
+++ b/packages/PrintSpooler/res/values-hy-rAM/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Պահել"</string>
<string name="label_destination" msgid="9132510997381599275">"Նպատակակետ"</string>
<string name="label_copies" msgid="3634531042822968308">"Պատճեններ"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Թղթի չափը"</string>
+ <string name="label_color" msgid="1108690305218188969">"Գույնը"</string>
<string name="label_orientation" msgid="2853142581990496477">"Դիրքավորում"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Էջեր (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"օր.՝ 1-5, 8, 11-13"</string>
<string name="print_preview" msgid="8010217796057763343">"Տպելու նախադիտում"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Նախադիտման համար տեղադրեք PDF դիտարկիչ"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Տպելու ծրագիրը վթարի է ենթարկվել"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"անհասանելի է"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Ձևավորվում է տպելու աշխատանքը"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Պահել որպես PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Բոլոր տպիչները..."</string>
diff --git a/packages/PrintSpooler/res/values-it/strings.xml b/packages/PrintSpooler/res/values-it/strings.xml
index b6859a9..8483047 100644
--- a/packages/PrintSpooler/res/values-it/strings.xml
+++ b/packages/PrintSpooler/res/values-it/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Salva"</string>
<string name="label_destination" msgid="9132510997381599275">"Destinazione"</string>
<string name="label_copies" msgid="3634531042822968308">"Copie"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Formato carta"</string>
+ <string name="label_color" msgid="1108690305218188969">"A colori"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientamento"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Pagine (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"Es.: 1-5, 8, 11-13"</string>
<string name="print_preview" msgid="8010217796057763343">"Anteprima di stampa"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Installa visualizzatore PDF per anteprima"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Arresto anomalo dell\'app di stampa"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"non disponibile"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Generazione processo di stampa"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Salva in PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Tutte le stampanti…"</string>
diff --git a/packages/PrintSpooler/res/values-mn-rMN/strings.xml b/packages/PrintSpooler/res/values-mn-rMN/strings.xml
index be2a01e..d32acd7 100644
--- a/packages/PrintSpooler/res/values-mn-rMN/strings.xml
+++ b/packages/PrintSpooler/res/values-mn-rMN/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Хадгалах"</string>
<string name="label_destination" msgid="9132510997381599275">"Хүлээн авагч"</string>
<string name="label_copies" msgid="3634531042822968308">"Хуулбарууд"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Цаасны хэмжээ"</string>
+ <string name="label_color" msgid="1108690305218188969">"Өнгө"</string>
<string name="label_orientation" msgid="2853142581990496477">"Чиглэл"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"ХУУДСУУД (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"жнь. 1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Хэвлэхээр урьдчилан харах"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Урьдчилан харахын тулд PDF харагчийг суулгах"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Хэвлэгч апп гацсан"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"Байхгүй"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Хэвлэх ажил үүсгэж байна"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"PDF болгож хадгалах"</string>
<string name="all_printers" msgid="5018829726861876202">"Бүх принтерүүд…"</string>
diff --git a/packages/PrintSpooler/res/values-nb/strings.xml b/packages/PrintSpooler/res/values-nb/strings.xml
index a862abe..318af38 100644
--- a/packages/PrintSpooler/res/values-nb/strings.xml
+++ b/packages/PrintSpooler/res/values-nb/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Lagre"</string>
<string name="label_destination" msgid="9132510997381599275">"Destinasjon"</string>
<string name="label_copies" msgid="3634531042822968308">"Kopier"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Papirstørrelse"</string>
+ <string name="label_color" msgid="1108690305218188969">"Farge"</string>
<string name="label_orientation" msgid="2853142581990496477">"Retning"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Sider (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"f.eks. 2–5, 8"</string>
<string name="print_preview" msgid="8010217796057763343">"Utskriftsforhåndsvisning"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Installer PDF-leser for forhåndsvisning"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Utskriftsappen krasjet"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"ikke tilgjengelig"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Genererer utskriftsjobb"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Lagre som PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Alle skrivere"</string>
diff --git a/packages/PrintSpooler/res/values-nl/strings.xml b/packages/PrintSpooler/res/values-nl/strings.xml
index 16abbd1..7227e06 100644
--- a/packages/PrintSpooler/res/values-nl/strings.xml
+++ b/packages/PrintSpooler/res/values-nl/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Opslaan"</string>
<string name="label_destination" msgid="9132510997381599275">"Bestemming"</string>
<string name="label_copies" msgid="3634531042822968308">"Aantal exemplaren"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Papierformaat"</string>
+ <string name="label_color" msgid="1108690305218188969">"Kleur"</string>
<string name="label_orientation" msgid="2853142581990496477">"Stand"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Pagina\'s (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"bijv. 1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Afdrukvoorbeeld"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Pdf-viewer installeren voor voorbeeld"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Afdruk-app gecrasht"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"niet beschikbaar"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Afdruktaak genereren"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Opslaan als pdf"</string>
<string name="all_printers" msgid="5018829726861876202">"Alle printers…"</string>
diff --git a/packages/PrintSpooler/res/values-pl/strings.xml b/packages/PrintSpooler/res/values-pl/strings.xml
index 17df518..3705373 100644
--- a/packages/PrintSpooler/res/values-pl/strings.xml
+++ b/packages/PrintSpooler/res/values-pl/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Zapisz"</string>
<string name="label_destination" msgid="9132510997381599275">"Miejsce docelowe"</string>
<string name="label_copies" msgid="3634531042822968308">"Kopie"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Rozmiar papieru"</string>
+ <string name="label_color" msgid="1108690305218188969">"Kolor"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientacja"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Strony (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"np. 1-5, 8, 11-13"</string>
<string name="print_preview" msgid="8010217796057763343">"Podgląd wydruku"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Zainstaluj przeglądarkę PDF, by zobaczyć podgląd"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Aplikacja drukująca uległa awarii"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"brak informacji"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Generowanie zadania wydruku"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Zapisz jako PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Wszystkie drukarki…"</string>
diff --git a/packages/PrintSpooler/res/values-pt-rPT/strings.xml b/packages/PrintSpooler/res/values-pt-rPT/strings.xml
index b2a3094..e2bab7d 100644
--- a/packages/PrintSpooler/res/values-pt-rPT/strings.xml
+++ b/packages/PrintSpooler/res/values-pt-rPT/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Guardar"</string>
<string name="label_destination" msgid="9132510997381599275">"Destino"</string>
<string name="label_copies" msgid="3634531042822968308">"Cópias"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Tamanho do papel"</string>
+ <string name="label_color" msgid="1108690305218188969">"Cor"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientação"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Páginas (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"por exemplo, 1-5, 8, 11-13"</string>
<string name="print_preview" msgid="8010217796057763343">"Pré-visualização de impressão"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Instalar o leitor de PDF para pré-visualização"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"A aplicação de impressão bloqueou"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"indisponível"</string>
<string name="generating_print_job" msgid="3119608742651698916">"A gerar tarefa de impressão"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Guardar como PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Todas as impressoras..."</string>
diff --git a/packages/PrintSpooler/res/values-pt/strings.xml b/packages/PrintSpooler/res/values-pt/strings.xml
index 1883657..82ef89c 100644
--- a/packages/PrintSpooler/res/values-pt/strings.xml
+++ b/packages/PrintSpooler/res/values-pt/strings.xml
@@ -16,7 +16,7 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="4469836075319831821">"Spooler de impressão"</string>
+ <string name="app_label" msgid="4469836075319831821">"Sp. de impressão"</string>
<string name="print_button" msgid="645164566271246268">"Imprimir"</string>
<string name="save_button" msgid="1921310454071758999">"Salvar"</string>
<string name="label_destination" msgid="9132510997381599275">"Destino"</string>
@@ -28,7 +28,7 @@
<string name="label_orientation" msgid="2853142581990496477">"Orientação"</string>
<!-- no translation found for label_pages (6300874667546617333) -->
<skip />
- <string name="pages_range_example" msgid="4069269138547562081">"1–5, 8, 11–13"</string>
+ <string name="pages_range_example" msgid="4069269138547562081">"ex.: 1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Visualização de impressão"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Instalar o visualizador de PDF"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"O aplicativo de impressão falhou"</string>
@@ -37,7 +37,7 @@
<string name="generating_print_job" msgid="3119608742651698916">"Gerando trabalho de impressão"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Salvar como PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Todas as impressoras…"</string>
- <string name="search" msgid="5421724265322228497">"Pesquisa"</string>
+ <string name="search" msgid="5421724265322228497">"Pesquisar"</string>
<string name="all_printers_label" msgid="3178848870161526399">"Todas as impressoras"</string>
<string name="choose_print_service" msgid="3740309762324459694">"Selecione o serviço de impressão"</string>
<string name="search_play_store" msgid="1575218005860538249">"Pesquisar na Play Store"</string>
diff --git a/packages/PrintSpooler/res/values-ro/strings.xml b/packages/PrintSpooler/res/values-ro/strings.xml
index 1fe8d6d..4cd2432 100644
--- a/packages/PrintSpooler/res/values-ro/strings.xml
+++ b/packages/PrintSpooler/res/values-ro/strings.xml
@@ -16,24 +16,20 @@
<resources xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="app_label" msgid="4469836075319831821">"Print Spooler"</string>
+ <string name="app_label" msgid="4469836075319831821">"Derulator print."</string>
<string name="print_button" msgid="645164566271246268">"Printați"</string>
<string name="save_button" msgid="1921310454071758999">"Salvați"</string>
<string name="label_destination" msgid="9132510997381599275">"Destinație"</string>
<string name="label_copies" msgid="3634531042822968308">"Copii"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Formatul hârtiei"</string>
+ <string name="label_color" msgid="1108690305218188969">"Color"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientare"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Pagini (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"ex. 1-5, 8, 11-13"</string>
<string name="print_preview" msgid="8010217796057763343">"Previzualizați printarea"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Instalați PDF viewer pentru previzualizare"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Aplicația de printare s-a blocat"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"indisponibil"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Se generează sarcină printare"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Salvați ca PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Toate imprimantele..."</string>
@@ -47,7 +43,7 @@
<string name="blocked_notification_title_template" msgid="1175435827331588646">"Printare blocată: <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancel" msgid="4373674107267141885">"Anulați"</string>
<string name="restart" msgid="2472034227037808749">"Reporniți"</string>
- <string name="no_connection_to_printer" msgid="2159246915977282728">"Nicio conexiune la imprimantă"</string>
+ <string name="no_connection_to_printer" msgid="2159246915977282728">"Nu există conexiune la o imprimantă"</string>
<string name="reason_unknown" msgid="5507940196503246139">"necunoscut"</string>
<string-array name="color_mode_labels">
<item msgid="7602948745415174937">"Alb-negru"</item>
diff --git a/packages/PrintSpooler/res/values-sl/strings.xml b/packages/PrintSpooler/res/values-sl/strings.xml
index fe4f236..f43ed41 100644
--- a/packages/PrintSpooler/res/values-sl/strings.xml
+++ b/packages/PrintSpooler/res/values-sl/strings.xml
@@ -21,20 +21,16 @@
<string name="save_button" msgid="1921310454071758999">"Shrani"</string>
<string name="label_destination" msgid="9132510997381599275">"Cilj"</string>
<string name="label_copies" msgid="3634531042822968308">"Št. kopij"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Velikost papirja"</string>
+ <string name="label_color" msgid="1108690305218188969">"Barvno"</string>
<string name="label_orientation" msgid="2853142581990496477">"Postavitev"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Št. strani (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"npr. 1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Predogled tiskanja"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Za predogled namestite pregledovalnik za PDF-je"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Aplikacija za tiskanje se je zrušila"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
- <string name="generating_print_job" msgid="3119608742651698916">"Ustvarjanje zaht. za tiskanje"</string>
+ <string name="page_count_unknown" msgid="7412881437770983864">"ni na voljo"</string>
+ <string name="generating_print_job" msgid="3119608742651698916">"Ustvarjanje zahteve za tisk"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Shrani kot PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Vsi tiskalniki …"</string>
<string name="search" msgid="5421724265322228497">"Iskanje"</string>
diff --git a/packages/PrintSpooler/res/values-sr/strings.xml b/packages/PrintSpooler/res/values-sr/strings.xml
index 256a7e6..4839d0c 100644
--- a/packages/PrintSpooler/res/values-sr/strings.xml
+++ b/packages/PrintSpooler/res/values-sr/strings.xml
@@ -21,25 +21,21 @@
<string name="save_button" msgid="1921310454071758999">"Сачувај"</string>
<string name="label_destination" msgid="9132510997381599275">"Одредиште"</string>
<string name="label_copies" msgid="3634531042822968308">"Копије"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Величина папира"</string>
+ <string name="label_color" msgid="1108690305218188969">"Боја"</string>
<string name="label_orientation" msgid="2853142581990496477">"Положај"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Странице (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"нпр. 1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Преглед пре штампања"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Инсталирај PDF приказивач за преглед"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Апликација за штампање је отказала"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"недоступно"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Генерисање задатка за штампање"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Сачувај као PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Сви штампачи…"</string>
<string name="search" msgid="5421724265322228497">"Претражи"</string>
<string name="all_printers_label" msgid="3178848870161526399">"Сви штампачи"</string>
- <string name="choose_print_service" msgid="3740309762324459694">"Избор услуге штампања"</string>
+ <string name="choose_print_service" msgid="3740309762324459694">"Изаберите услугу штампања"</string>
<string name="search_play_store" msgid="1575218005860538249">"Претражи у Play продавници"</string>
<string name="printing_notification_title_template" msgid="295903957762447362">"Штампа се <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancelling_notification_title_template" msgid="1821759594704703197">"Отказује се <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
diff --git a/packages/PrintSpooler/res/values-sv/strings.xml b/packages/PrintSpooler/res/values-sv/strings.xml
index 1bb9200..d6068ba 100644
--- a/packages/PrintSpooler/res/values-sv/strings.xml
+++ b/packages/PrintSpooler/res/values-sv/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Spara"</string>
<string name="label_destination" msgid="9132510997381599275">"Destination"</string>
<string name="label_copies" msgid="3634531042822968308">"Kopior"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Pappersstorlek"</string>
+ <string name="label_color" msgid="1108690305218188969">"Färg"</string>
<string name="label_orientation" msgid="2853142581990496477">"Orientering"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Sidor (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"t.ex. 1–5, 8"</string>
<string name="print_preview" msgid="8010217796057763343">"Förhandsgranskning"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Installera PDF-läsare för förhandsgranskning"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Utskriftsappen kraschade"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"otillgängligt"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Genererar utskriftsjobb"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Spara som PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Alla skrivare ..."</string>
diff --git a/packages/PrintSpooler/res/values-sw/strings.xml b/packages/PrintSpooler/res/values-sw/strings.xml
index 2338197..b743cf9 100644
--- a/packages/PrintSpooler/res/values-sw/strings.xml
+++ b/packages/PrintSpooler/res/values-sw/strings.xml
@@ -19,7 +19,7 @@
<string name="app_label" msgid="4469836075319831821">"Programu ya kuandaa Printa kwa ajili ya Kuchapisha"</string>
<string name="print_button" msgid="645164566271246268">"Chapisha"</string>
<string name="save_button" msgid="1921310454071758999">"Hifadhi"</string>
- <string name="label_destination" msgid="9132510997381599275">"Ufikio"</string>
+ <string name="label_destination" msgid="9132510997381599275">"Itakapofika"</string>
<string name="label_copies" msgid="3634531042822968308">"Nakala"</string>
<!-- no translation found for label_paper_size (8681895607876809323) -->
<skip />
@@ -29,15 +29,15 @@
<!-- no translation found for label_pages (6300874667546617333) -->
<skip />
<string name="pages_range_example" msgid="4069269138547562081">"k.m. 1–5, 8, 11–13"</string>
- <string name="print_preview" msgid="8010217796057763343">"Uhakiki wa chapisho"</string>
+ <string name="print_preview" msgid="8010217796057763343">"Chungulia kwanza kabla ya kuchapisha"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Sakinisha kitazamaji cha PDF kwa onyesho la kuchungulia"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Programu ya kuchapisha imeacha kufanya kazi"</string>
<!-- no translation found for page_count_unknown (7412881437770983864) -->
<skip />
- <string name="generating_print_job" msgid="3119608742651698916">"Inazalisha kazi iliyochapishwa"</string>
+ <string name="generating_print_job" msgid="3119608742651698916">"Inazanzisha kazi ya kuchapisha"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Hifadhi kama PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Printa zote..."</string>
- <string name="search" msgid="5421724265322228497">"Tafuta na Google"</string>
+ <string name="search" msgid="5421724265322228497">"Tafuta"</string>
<string name="all_printers_label" msgid="3178848870161526399">"Printa zote"</string>
<string name="choose_print_service" msgid="3740309762324459694">"Chagua huduma ya printa"</string>
<string name="search_play_store" msgid="1575218005860538249">"Tafuta katika duka la Google Play"</string>
@@ -47,7 +47,7 @@
<string name="blocked_notification_title_template" msgid="1175435827331588646">"Printa imefungwa <xliff:g id="PRINT_JOB_NAME">%1$s</xliff:g>"</string>
<string name="cancel" msgid="4373674107267141885">"Ghairi"</string>
<string name="restart" msgid="2472034227037808749">"Anzisha upya"</string>
- <string name="no_connection_to_printer" msgid="2159246915977282728">"Hakuna muunganisho wa printa"</string>
+ <string name="no_connection_to_printer" msgid="2159246915977282728">"Hakuna muunganisho kwa printa"</string>
<string name="reason_unknown" msgid="5507940196503246139">"haijulikani"</string>
<string-array name="color_mode_labels">
<item msgid="7602948745415174937">"Nyeusi na Nyeupe"</item>
diff --git a/packages/PrintSpooler/res/values-tr/strings.xml b/packages/PrintSpooler/res/values-tr/strings.xml
index d5a7463..fb0383d 100644
--- a/packages/PrintSpooler/res/values-tr/strings.xml
+++ b/packages/PrintSpooler/res/values-tr/strings.xml
@@ -30,7 +30,7 @@
<skip />
<string name="pages_range_example" msgid="4069269138547562081">"ör. 1-5, 8, 11-13"</string>
<string name="print_preview" msgid="8010217796057763343">"Yazdırmayı önizle"</string>
- <string name="install_for_print_preview" msgid="6366303997385509332">"Önizlemek için PDF görüntüleyiciyi yükleyin"</string>
+ <string name="install_for_print_preview" msgid="6366303997385509332">"Önizlemek için PDF görüntüleyici yükleyin"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Yazdırma uygulaması kilitlendi"</string>
<!-- no translation found for page_count_unknown (7412881437770983864) -->
<skip />
diff --git a/packages/PrintSpooler/res/values-uk/strings.xml b/packages/PrintSpooler/res/values-uk/strings.xml
index f025157..52f0e9f 100644
--- a/packages/PrintSpooler/res/values-uk/strings.xml
+++ b/packages/PrintSpooler/res/values-uk/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Зберегти"</string>
<string name="label_destination" msgid="9132510997381599275">"Місце признач-ня"</string>
<string name="label_copies" msgid="3634531042822968308">"Копії"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Розмір паперу"</string>
+ <string name="label_color" msgid="1108690305218188969">"Колір"</string>
<string name="label_orientation" msgid="2853142581990496477">"Орієнтація"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Сторінки (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"напр.,1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Версія для друку"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Установити засіб перегляду PDF"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Програма друку аварійно завершила роботу"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"недоступно"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Створюється завдання друку"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Зберегти як PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Усі принтери…"</string>
diff --git a/packages/PrintSpooler/res/values-zu/strings.xml b/packages/PrintSpooler/res/values-zu/strings.xml
index 8703632..c5d1de4 100644
--- a/packages/PrintSpooler/res/values-zu/strings.xml
+++ b/packages/PrintSpooler/res/values-zu/strings.xml
@@ -21,19 +21,15 @@
<string name="save_button" msgid="1921310454071758999">"Londoloza"</string>
<string name="label_destination" msgid="9132510997381599275">"Indawo"</string>
<string name="label_copies" msgid="3634531042822968308">"Amakhophi"</string>
- <!-- no translation found for label_paper_size (8681895607876809323) -->
- <skip />
- <!-- no translation found for label_color (1108690305218188969) -->
- <skip />
+ <string name="label_paper_size" msgid="8681895607876809323">"Usayizi wephepha"</string>
+ <string name="label_color" msgid="1108690305218188969">"Umbala"</string>
<string name="label_orientation" msgid="2853142581990496477">"Umumo"</string>
- <!-- no translation found for label_pages (6300874667546617333) -->
- <skip />
+ <string name="label_pages" msgid="6300874667546617333">"Amakhasi (<xliff:g id="PAGE_COUNT">%1$s</xliff:g>)"</string>
<string name="pages_range_example" msgid="4069269138547562081">"isb. 1–5, 8, 11–13"</string>
<string name="print_preview" msgid="8010217796057763343">"Ukubuka kuqala kokuphrinta"</string>
<string name="install_for_print_preview" msgid="6366303997385509332">"Faka isibukeli se-PDF ukuze uhlole kuqala"</string>
<string name="printing_app_crashed" msgid="854477616686566398">"Ukuphrinta uhlelo lokusebenza kukhubazekile"</string>
- <!-- no translation found for page_count_unknown (7412881437770983864) -->
- <skip />
+ <string name="page_count_unknown" msgid="7412881437770983864">"ayitholakali"</string>
<string name="generating_print_job" msgid="3119608742651698916">"Ikhiqiza umsebenzi wokuphrinta"</string>
<string name="save_as_pdf" msgid="5718454119847596853">"Londoloza njenge-PDF"</string>
<string name="all_printers" msgid="5018829726861876202">"Wonke amaphrinta…"</string>
diff --git a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java
index 05b0b69..48d7be0 100644
--- a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java
+++ b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java
@@ -77,6 +77,8 @@ import android.widget.EditText;
import android.widget.Spinner;
import android.widget.TextView;
+import libcore.io.IoUtils;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -92,8 +94,6 @@ import java.util.concurrent.atomic.AtomicInteger;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import libcore.io.IoUtils;
-
/**
* Activity for configuring a print job.
*/
@@ -144,7 +144,8 @@ public class PrintJobConfigActivity extends Activity {
"(?=[]\\[+&|!(){}^\"~*?:\\\\])");
private static final Pattern PATTERN_PAGE_RANGE = Pattern.compile(
- "([0-9]+[\\s]*[\\-]?[\\s]*[0-9]*[\\s]*[,]?[\\s]*)+");
+ "[\\s]*[0-9]*[\\s]*[\\-]?[\\s]*[0-9]*[\\s]*?(([,])"
+ + "[\\s]*[0-9]*[\\s]*[\\-]?[\\s]*[0-9]*[\\s]*|[\\s]*)+");
public static final PageRange[] ALL_PAGES_ARRAY = new PageRange[] {PageRange.ALL_PAGES};
@@ -1076,9 +1077,13 @@ public class PrintJobConfigActivity extends Activity {
return;
}
+ // The range
Matcher matcher = PATTERN_DIGITS.matcher(text);
while (matcher.find()) {
- String numericString = text.substring(matcher.start(), matcher.end());
+ String numericString = text.substring(matcher.start(), matcher.end()).trim();
+ if (TextUtils.isEmpty(numericString)) {
+ continue;
+ }
final int pageIndex = Integer.parseInt(numericString);
if (pageIndex < 1 || pageIndex > mDocument.info.getPageCount()) {
mPageRangeEditText.setError("");
@@ -1506,18 +1511,21 @@ public class PrintJobConfigActivity extends Activity {
while (mStringCommaSplitter.hasNext()) {
String range = mStringCommaSplitter.next().trim();
+ if (TextUtils.isEmpty(range)) {
+ continue;
+ }
final int dashIndex = range.indexOf('-');
final int fromIndex;
final int toIndex;
if (dashIndex > 0) {
- fromIndex = Integer.parseInt(range.substring(0, dashIndex)) - 1;
+ fromIndex = Integer.parseInt(range.substring(0, dashIndex).trim()) - 1;
// It is possible that the dash is at the end since the input
// verification can has to allow the user to keep entering if
// this would lead to a valid input. So we handle this.
toIndex = (dashIndex < range.length() - 1)
? Integer.parseInt(range.substring(dashIndex + 1,
- range.length())) - 1 : fromIndex;
+ range.length()).trim()) - 1 : fromIndex;
} else {
fromIndex = toIndex = Integer.parseInt(range) - 1;
}
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png
index fd9d9db..ece947a 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_qs_airplane_off.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/ic_qs_location_on.png b/packages/SystemUI/res/drawable-hdpi/ic_qs_location_on.png
index 0df2411..b03d30c 100644
--- a/packages/SystemUI/res/drawable-hdpi/ic_qs_location_on.png
+++ b/packages/SystemUI/res/drawable-hdpi/ic_qs_location_on.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-hdpi/recents_thumbnail_bg_press.9.png b/packages/SystemUI/res/drawable-hdpi/recents_thumbnail_bg_press.9.png
index e591a7b..cbcb3e3 100644
--- a/packages/SystemUI/res/drawable-hdpi/recents_thumbnail_bg_press.9.png
+++ b/packages/SystemUI/res/drawable-hdpi/recents_thumbnail_bg_press.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_off.png
index d37e446..7db72fb 100644
--- a/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_off.png
+++ b/packages/SystemUI/res/drawable-ldrtl-hdpi/ic_qs_airplane_off.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_off.png
index d5e1da4..5ba15a7 100644
--- a/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_off.png
+++ b/packages/SystemUI/res/drawable-ldrtl-mdpi/ic_qs_airplane_off.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_off.png
index 8d53a7c..294ae48 100644
--- a/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_off.png
+++ b/packages/SystemUI/res/drawable-ldrtl-xhdpi/ic_qs_airplane_off.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_airplane_off.png
index 255b39d..7b7e329 100644
--- a/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_airplane_off.png
+++ b/packages/SystemUI/res/drawable-ldrtl-xxhdpi/ic_qs_airplane_off.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.png
index 31fbf40..8ab2e1e 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_qs_airplane_off.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/ic_qs_location_on.png b/packages/SystemUI/res/drawable-mdpi/ic_qs_location_on.png
index c6f41d2..867c57d 100644
--- a/packages/SystemUI/res/drawable-mdpi/ic_qs_location_on.png
+++ b/packages/SystemUI/res/drawable-mdpi/ic_qs_location_on.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-mdpi/recents_thumbnail_bg_press.9.png b/packages/SystemUI/res/drawable-mdpi/recents_thumbnail_bg_press.9.png
index 7dfea4c..3ac7c40 100644
--- a/packages/SystemUI/res/drawable-mdpi/recents_thumbnail_bg_press.9.png
+++ b/packages/SystemUI/res/drawable-mdpi/recents_thumbnail_bg_press.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.png
index ea4b8d6..32e6c49 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_qs_airplane_off.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/ic_qs_location_on.png b/packages/SystemUI/res/drawable-xhdpi/ic_qs_location_on.png
index 77c3ec0..6300bdc 100644
--- a/packages/SystemUI/res/drawable-xhdpi/ic_qs_location_on.png
+++ b/packages/SystemUI/res/drawable-xhdpi/ic_qs_location_on.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xhdpi/recents_thumbnail_bg_press.9.png b/packages/SystemUI/res/drawable-xhdpi/recents_thumbnail_bg_press.9.png
index f01a79e..78a69f5 100644
--- a/packages/SystemUI/res/drawable-xhdpi/recents_thumbnail_bg_press.9.png
+++ b/packages/SystemUI/res/drawable-xhdpi/recents_thumbnail_bg_press.9.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_airplane_off.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_airplane_off.png
index 9867b0b..3d3c9bb 100644
--- a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_airplane_off.png
+++ b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_airplane_off.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_location_on.png b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_location_on.png
index 3175636..d6d4c70 100644
--- a/packages/SystemUI/res/drawable-xxhdpi/ic_qs_location_on.png
+++ b/packages/SystemUI/res/drawable-xxhdpi/ic_qs_location_on.png
Binary files differ
diff --git a/packages/SystemUI/res/drawable-xxhdpi/recents_thumbnail_bg_press.9.png b/packages/SystemUI/res/drawable-xxhdpi/recents_thumbnail_bg_press.9.png
index b7bbd82..1fa1e62 100644
--- a/packages/SystemUI/res/drawable-xxhdpi/recents_thumbnail_bg_press.9.png
+++ b/packages/SystemUI/res/drawable-xxhdpi/recents_thumbnail_bg_press.9.png
Binary files differ
diff --git a/packages/SystemUI/res/layout/quick_settings_tile_rssi.xml b/packages/SystemUI/res/layout/quick_settings_tile_rssi.xml
index cabfaa5..6bf31e0 100644
--- a/packages/SystemUI/res/layout/quick_settings_tile_rssi.xml
+++ b/packages/SystemUI/res/layout/quick_settings_tile_rssi.xml
@@ -66,5 +66,6 @@
android:text="@string/quick_settings_rssi_label"
android:layout_centerHorizontal="true"
android:layout_below="@id/rssi_images"
+ android:textAllCaps="@bool/quick_settings_rssi_tile_capitalization"
/>
</RelativeLayout> \ No newline at end of file
diff --git a/packages/SystemUI/res/values-mcc262-mnc07/config.xml b/packages/SystemUI/res/values-mcc262-mnc07/config.xml
new file mode 100644
index 0000000..7b7b8f3
--- /dev/null
+++ b/packages/SystemUI/res/values-mcc262-mnc07/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+/*
+** Copyright 2013, The Android Open Source Project
+**
+** Licensed under the Apache License, Version 2.0 (the "License");
+** you may not use this file except in compliance with the License.
+** You may obtain a copy of the License at
+**
+** http://www.apache.org/licenses/LICENSE-2.0
+**
+** Unless required by applicable law or agreed to in writing, software
+** distributed under the License is distributed on an "AS IS" BASIS,
+** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+** See the License for the specific language governing permissions and
+** limitations under the License.
+*/
+-->
+
+<!-- These resources are around just to allow their values to be customized
+ for different hardware and product builds. -->
+<resources>
+ <!-- Whether or not the RSSI tile is capitalized or not. -->
+ <bool name="quick_settings_rssi_tile_capitalization">false</bool>
+</resources>
+
diff --git a/packages/SystemUI/res/values/config.xml b/packages/SystemUI/res/values/config.xml
index 8ce959f..3869db3 100644
--- a/packages/SystemUI/res/values/config.xml
+++ b/packages/SystemUI/res/values/config.xml
@@ -87,6 +87,9 @@
<!-- Whether rotation lock shows up in quick settings or not -->
<bool name="quick_settings_show_rotation_lock">false</bool>
+ <!-- Whether or not the RSSI tile is capitalized or not. -->
+ <bool name="quick_settings_rssi_tile_capitalization">true</bool>
+
<!-- Timeouts for brightness dialog to disappear -->
<integer name="quick_settings_brightness_dialog_short_timeout">2000</integer>
<integer name="quick_settings_brightness_dialog_long_timeout">4000</integer>