diff options
24 files changed, 473 insertions, 299 deletions
diff --git a/api/current.txt b/api/current.txt index 5fc7edd3fe7e..59c5efa0caff 100644 --- a/api/current.txt +++ b/api/current.txt @@ -19286,6 +19286,8 @@ package android.print { field public static final android.print.PrintAttributes.MediaSize PRC_9; field public static final android.print.PrintAttributes.MediaSize ROC_16K; field public static final android.print.PrintAttributes.MediaSize ROC_8K; + field public static final android.print.PrintAttributes.MediaSize UNKNOWN_LANDSCAPE; + field public static final android.print.PrintAttributes.MediaSize UNKNOWN_PORTRAIT; } public static final class PrintAttributes.Resolution { @@ -30381,6 +30383,7 @@ package android.webkit { method public deprecated void setPictureListener(android.webkit.WebView.PictureListener); method public void setVerticalScrollbarOverlay(boolean); method public void setWebChromeClient(android.webkit.WebChromeClient); + method public static void setWebContentsDebuggingEnabled(boolean); method public void setWebViewClient(android.webkit.WebViewClient); method public deprecated boolean showFindDialog(java.lang.String, boolean); method public void stopLoading(); diff --git a/core/java/android/net/MobileDataStateTracker.java b/core/java/android/net/MobileDataStateTracker.java index b914940ddd40..c1065145dbf2 100644 --- a/core/java/android/net/MobileDataStateTracker.java +++ b/core/java/android/net/MobileDataStateTracker.java @@ -211,8 +211,6 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker { private class MobileDataStateReceiver extends BroadcastReceiver { @Override public void onReceive(Context context, Intent intent) { - // Assume this isn't a provisioning network. - mNetworkInfo.setIsConnectedToProvisioningNetwork(false); if (intent.getAction().equals(TelephonyIntents. ACTION_DATA_CONNECTION_CONNECTED_TO_PROVISIONING_APN)) { String apnName = intent.getStringExtra(PhoneConstants.DATA_APN_KEY); @@ -244,6 +242,11 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker { if (!TextUtils.equals(apnType, mApnType)) { return; } + // Assume this isn't a provisioning network. + mNetworkInfo.setIsConnectedToProvisioningNetwork(false); + if (DBG) { + log("Broadcast received: " + intent.getAction() + " apnType=" + apnType); + } int oldSubtype = mNetworkInfo.getSubtype(); int newSubType = TelephonyManager.getDefault().getNetworkType(); @@ -351,6 +354,8 @@ public class MobileDataStateTracker extends BaseNetworkStateTracker { } return; } + // Assume this isn't a provisioning network. + mNetworkInfo.setIsConnectedToProvisioningNetwork(false); String reason = intent.getStringExtra(PhoneConstants.FAILURE_REASON_KEY); String apnName = intent.getStringExtra(PhoneConstants.DATA_APN_KEY); if (DBG) { diff --git a/core/java/android/os/Bundle.java b/core/java/android/os/Bundle.java index 32b1b60437ea..f47ac4e49750 100644 --- a/core/java/android/os/Bundle.java +++ b/core/java/android/os/Bundle.java @@ -33,6 +33,8 @@ public final class Bundle implements Parcelable, Cloneable { private static final String LOG_TAG = "Bundle"; public static final Bundle EMPTY; + static final int BUNDLE_MAGIC = 0x4C444E42; // 'B' 'N' 'D' 'L' + static { EMPTY = new Bundle(); EMPTY.mMap = ArrayMap.EMPTY; @@ -1643,11 +1645,11 @@ public final class Bundle implements Parcelable, Cloneable { if (mParcelledData != null) { int length = mParcelledData.dataSize(); parcel.writeInt(length); - parcel.writeInt(0x4C444E42); // 'B' 'N' 'D' 'L' + parcel.writeInt(BUNDLE_MAGIC); parcel.appendFrom(mParcelledData, 0, length); } else { parcel.writeInt(-1); // dummy, will hold length - parcel.writeInt(0x4C444E42); // 'B' 'N' 'D' 'L' + parcel.writeInt(BUNDLE_MAGIC); int oldPos = parcel.dataPosition(); parcel.writeArrayMapInternal(mMap); @@ -1679,11 +1681,10 @@ public final class Bundle implements Parcelable, Cloneable { void readFromParcelInner(Parcel parcel, int length) { int magic = parcel.readInt(); - if (magic != 0x4C444E42) { + if (magic != BUNDLE_MAGIC) { //noinspection ThrowableInstanceNeverThrown - String st = Log.getStackTraceString(new RuntimeException()); - Log.e("Bundle", "readBundle: bad magic number"); - Log.e("Bundle", "readBundle: trace = " + st); + throw new IllegalStateException("Bad magic number for Bundle: 0x" + + Integer.toHexString(magic)); } // Advance within this Parcel @@ -1694,10 +1695,23 @@ public final class Bundle implements Parcelable, Cloneable { p.setDataPosition(0); p.appendFrom(parcel, offset, length); p.setDataPosition(0); - - mParcelledData = p; - mHasFds = p.hasFileDescriptors(); - mFdsKnown = true; + + if (mMap != null) { + // It is not allowed to have a Bundle with both a map and a parcel, so if we + // already have a map then we need to immediately unparcel into it. This also + // lets us know we need to go through the slow path of unparceling, since the + // map may already contains some data so the two need to be merged. + if (mFdsKnown) { + mHasFds |= p.hasFileDescriptors(); + } + int N = p.readInt(); + p.readArrayMapSafelyInternal(mMap, N, mClassLoader); + p.recycle(); + } else { + mParcelledData = p; + mHasFds = p.hasFileDescriptors(); + mFdsKnown = true; + } } @Override diff --git a/core/java/android/os/Parcel.java b/core/java/android/os/Parcel.java index fec2a3ee09b5..5f3a81c9c7a6 100644 --- a/core/java/android/os/Parcel.java +++ b/core/java/android/os/Parcel.java @@ -178,6 +178,7 @@ import java.util.Set; */ public final class Parcel { private static final boolean DEBUG_RECYCLE = false; + private static final boolean DEBUG_ARRAY_MAP = false; private static final String TAG = "Parcel"; @SuppressWarnings({"UnusedDeclaration"}) @@ -605,7 +606,14 @@ public final class Parcel { } final int N = val.size(); writeInt(N); + if (DEBUG_ARRAY_MAP) { + RuntimeException here = new RuntimeException("here"); + here.fillInStackTrace(); + Log.d(TAG, "Writing " + N + " ArrayMap entries", here); + } for (int i=0; i<N; i++) { + if (DEBUG_ARRAY_MAP) Log.d(TAG, " Write #" + i + ": key=0x" + + (val.keyAt(i) != null ? val.keyAt(i).hashCode() : 0) + " " + val.keyAt(i)); writeValue(val.keyAt(i)); writeValue(val.valueAt(i)); } @@ -2289,14 +2297,38 @@ public final class Parcel { /* package */ void readArrayMapInternal(ArrayMap outVal, int N, ClassLoader loader) { + if (DEBUG_ARRAY_MAP) { + RuntimeException here = new RuntimeException("here"); + here.fillInStackTrace(); + Log.d(TAG, "Reading " + N + " ArrayMap entries", here); + } while (N > 0) { Object key = readValue(loader); + if (DEBUG_ARRAY_MAP) Log.d(TAG, " Read #" + (N-1) + ": key=0x" + + (key != null ? key.hashCode() : 0) + " " + key); Object value = readValue(loader); outVal.append(key, value); N--; } } + /* package */ void readArrayMapSafelyInternal(ArrayMap outVal, int N, + ClassLoader loader) { + if (DEBUG_ARRAY_MAP) { + RuntimeException here = new RuntimeException("here"); + here.fillInStackTrace(); + Log.d(TAG, "Reading safely " + N + " ArrayMap entries", here); + } + while (N > 0) { + Object key = readValue(loader); + if (DEBUG_ARRAY_MAP) Log.d(TAG, " Read safe #" + (N-1) + ": key=0x" + + (key != null ? key.hashCode() : 0) + " " + key); + Object value = readValue(loader); + outVal.put(key, value); + N--; + } + } + private void readListInternal(List outVal, int N, ClassLoader loader) { while (N > 0) { diff --git a/core/java/android/print/PrintAttributes.java b/core/java/android/print/PrintAttributes.java index 94bbb08102cd..959380d93f40 100644 --- a/core/java/android/print/PrintAttributes.java +++ b/core/java/android/print/PrintAttributes.java @@ -30,10 +30,9 @@ import com.android.internal.R; * This class represents the attributes of a print job. */ public final class PrintAttributes implements Parcelable { - - /** Color mode: Monochrome color scheme, e.g. one color is used. */ + /** Color mode: Monochrome color scheme, for example one color is used. */ public static final int COLOR_MODE_MONOCHROME = 1 << 0; - /** Color mode: Color color scheme, e.g. many colors are used. */ + /** Color mode: Color color scheme, for example many colors are used. */ public static final int COLOR_MODE_COLOR = 1 << 1; private static final int VALID_COLOR_MODES = @@ -260,321 +259,344 @@ public final class PrintAttributes implements Parcelable { } /** - * This class specifies a supported media size. + * This class specifies a supported media size. Media size is the + * dimension of the media on which the content is printed. For + * example, the {@link #NA_LETTER} media size designates a page + * with size 8.5" x 11". */ public static final class MediaSize { private static final String LOG_TAG = "MediaSize"; - // TODO: Verify media sizes and add more standard ones. + /** + * Unknown media size in portrait mode. + * <p> + * <strong>Note: </strong>This is for specifying orientation without media + * size. You should not use the dimensions reported by this class. + * </p> + */ + public static final MediaSize UNKNOWN_PORTRAIT = + new MediaSize("UNKNOWN_PORTRAIT", "android", + R.string.mediasize_unknown_portrait, Integer.MAX_VALUE, 1); + + /** + * Unknown media size in landscape mode. + * <p> + * <strong>Note: </strong>This is for specifying orientation without media + * size. You should not use the dimensions reported by this class. + * </p> + */ + public static final MediaSize UNKNOWN_LANDSCAPE = + new MediaSize("UNKNOWN_LANDSCAPE", "android", + R.string.mediasize_unknown_landscape, 1, Integer.MAX_VALUE); // ISO sizes /** ISO A0 media size: 841mm x 1189mm (33.11" x 46.81") */ public static final MediaSize ISO_A0 = - new MediaSize("ISO_A0", "android", R.string.mediaSize_iso_a0, 33110, 46810); + new MediaSize("ISO_A0", "android", R.string.mediasize_iso_a0, 33110, 46810); /** ISO A1 media size: 594mm x 841mm (23.39" x 33.11") */ public static final MediaSize ISO_A1 = - new MediaSize("ISO_A1", "android", R.string.mediaSize_iso_a1, 23390, 33110); + new MediaSize("ISO_A1", "android", R.string.mediasize_iso_a1, 23390, 33110); /** ISO A2 media size: 420mm x 594mm (16.54" x 23.39") */ public static final MediaSize ISO_A2 = - new MediaSize("ISO_A2", "android", R.string.mediaSize_iso_a2, 16540, 23390); + new MediaSize("ISO_A2", "android", R.string.mediasize_iso_a2, 16540, 23390); /** ISO A3 media size: 297mm x 420mm (11.69" x 16.54") */ public static final MediaSize ISO_A3 = - new MediaSize("ISO_A3", "android", R.string.mediaSize_iso_a3, 11690, 16540); + new MediaSize("ISO_A3", "android", R.string.mediasize_iso_a3, 11690, 16540); /** ISO A4 media size: 210mm x 297mm (8.27" x 11.69") */ public static final MediaSize ISO_A4 = - new MediaSize("ISO_A4", "android", R.string.mediaSize_iso_a4, 8270, 11690); + new MediaSize("ISO_A4", "android", R.string.mediasize_iso_a4, 8270, 11690); /** ISO A5 media size: 148mm x 210mm (5.83" x 8.27") */ public static final MediaSize ISO_A5 = - new MediaSize("ISO_A5", "android", R.string.mediaSize_iso_a5, 5830, 8270); + new MediaSize("ISO_A5", "android", R.string.mediasize_iso_a5, 5830, 8270); /** ISO A6 media size: 105mm x 148mm (4.13" x 5.83") */ public static final MediaSize ISO_A6 = - new MediaSize("ISO_A6", "android", R.string.mediaSize_iso_a6, 4130, 5830); + new MediaSize("ISO_A6", "android", R.string.mediasize_iso_a6, 4130, 5830); /** ISO A7 media size: 74mm x 105mm (2.91" x 4.13") */ public static final MediaSize ISO_A7 = - new MediaSize("ISO_A7", "android", R.string.mediaSize_iso_a7, 2910, 4130); + new MediaSize("ISO_A7", "android", R.string.mediasize_iso_a7, 2910, 4130); /** ISO A8 media size: 52mm x 74mm (2.05" x 2.91") */ public static final MediaSize ISO_A8 = - new MediaSize("ISO_A8", "android", R.string.mediaSize_iso_a8, 2050, 2910); + new MediaSize("ISO_A8", "android", R.string.mediasize_iso_a8, 2050, 2910); /** ISO A9 media size: 37mm x 52mm (1.46" x 2.05") */ public static final MediaSize ISO_A9 = - new MediaSize("ISO_A9", "android", R.string.mediaSize_iso_a9, 1460, 2050); + new MediaSize("ISO_A9", "android", R.string.mediasize_iso_a9, 1460, 2050); /** ISO A10 media size: 26mm x 37mm (1.02" x 1.46") */ public static final MediaSize ISO_A10 = - new MediaSize("ISO_A10", "android", R.string.mediaSize_iso_a10, 1020, 1460); + new MediaSize("ISO_A10", "android", R.string.mediasize_iso_a10, 1020, 1460); /** ISO B0 media size: 1000mm x 1414mm (39.37" x 55.67") */ public static final MediaSize ISO_B0 = - new MediaSize("ISO_B0", "android", R.string.mediaSize_iso_b0, 39370, 55670); + new MediaSize("ISO_B0", "android", R.string.mediasize_iso_b0, 39370, 55670); /** ISO B1 media size: 707mm x 1000mm (27.83" x 39.37") */ public static final MediaSize ISO_B1 = - new MediaSize("ISO_B1", "android", R.string.mediaSize_iso_b1, 27830, 39370); + new MediaSize("ISO_B1", "android", R.string.mediasize_iso_b1, 27830, 39370); /** ISO B2 media size: 500mm x 707mm (19.69" x 27.83") */ public static final MediaSize ISO_B2 = - new MediaSize("ISO_B2", "android", R.string.mediaSize_iso_b2, 19690, 27830); + new MediaSize("ISO_B2", "android", R.string.mediasize_iso_b2, 19690, 27830); /** ISO B3 media size: 353mm x 500mm (13.90" x 19.69") */ public static final MediaSize ISO_B3 = - new MediaSize("ISO_B3", "android", R.string.mediaSize_iso_b3, 13900, 19690); + new MediaSize("ISO_B3", "android", R.string.mediasize_iso_b3, 13900, 19690); /** ISO B4 media size: 250mm x 353mm (9.84" x 13.90") */ public static final MediaSize ISO_B4 = - new MediaSize("ISO_B4", "android", R.string.mediaSize_iso_b4, 9840, 13900); + new MediaSize("ISO_B4", "android", R.string.mediasize_iso_b4, 9840, 13900); /** ISO B5 media size: 176mm x 250mm (6.93" x 9.84") */ public static final MediaSize ISO_B5 = - new MediaSize("ISO_B5", "android", R.string.mediaSize_iso_b5, 6930, 9840); + new MediaSize("ISO_B5", "android", R.string.mediasize_iso_b5, 6930, 9840); /** ISO B6 media size: 125mm x 176mm (4.92" x 6.93") */ public static final MediaSize ISO_B6 = - new MediaSize("ISO_B6", "android", R.string.mediaSize_iso_b6, 4920, 6930); + new MediaSize("ISO_B6", "android", R.string.mediasize_iso_b6, 4920, 6930); /** ISO B7 media size: 88mm x 125mm (3.46" x 4.92") */ public static final MediaSize ISO_B7 = - new MediaSize("ISO_B7", "android", R.string.mediaSize_iso_b7, 3460, 4920); + new MediaSize("ISO_B7", "android", R.string.mediasize_iso_b7, 3460, 4920); /** ISO B8 media size: 62mm x 88mm (2.44" x 3.46") */ public static final MediaSize ISO_B8 = - new MediaSize("ISO_B8", "android", R.string.mediaSize_iso_b8, 2440, 3460); + new MediaSize("ISO_B8", "android", R.string.mediasize_iso_b8, 2440, 3460); /** ISO B9 media size: 44mm x 62mm (1.73" x 2.44") */ public static final MediaSize ISO_B9 = - new MediaSize("ISO_B9", "android", R.string.mediaSize_iso_b9, 1730, 2440); + new MediaSize("ISO_B9", "android", R.string.mediasize_iso_b9, 1730, 2440); /** ISO B10 media size: 31mm x 44mm (1.22" x 1.73") */ public static final MediaSize ISO_B10 = - new MediaSize("ISO_B10", "android", R.string.mediaSize_iso_b10, 1220, 1730); + new MediaSize("ISO_B10", "android", R.string.mediasize_iso_b10, 1220, 1730); /** ISO C0 media size: 917mm x 1297mm (36.10" x 51.06") */ public static final MediaSize ISO_C0 = - new MediaSize("ISO_C0", "android", R.string.mediaSize_iso_c0, 36100, 51060); + new MediaSize("ISO_C0", "android", R.string.mediasize_iso_c0, 36100, 51060); /** ISO C1 media size: 648mm x 917mm (25.51" x 36.10") */ public static final MediaSize ISO_C1 = - new MediaSize("ISO_C1", "android", R.string.mediaSize_iso_c1, 25510, 36100); + new MediaSize("ISO_C1", "android", R.string.mediasize_iso_c1, 25510, 36100); /** ISO C2 media size: 458mm x 648mm (18.03" x 25.51") */ public static final MediaSize ISO_C2 = - new MediaSize("ISO_C2", "android", R.string.mediaSize_iso_c2, 18030, 25510); + new MediaSize("ISO_C2", "android", R.string.mediasize_iso_c2, 18030, 25510); /** ISO C3 media size: 324mm x 458mm (12.76" x 18.03") */ public static final MediaSize ISO_C3 = - new MediaSize("ISO_C3", "android", R.string.mediaSize_iso_c3, 12760, 18030); + new MediaSize("ISO_C3", "android", R.string.mediasize_iso_c3, 12760, 18030); /** ISO C4 media size: 229mm x 324mm (9.02" x 12.76") */ public static final MediaSize ISO_C4 = - new MediaSize("ISO_C4", "android", R.string.mediaSize_iso_c4, 9020, 12760); + new MediaSize("ISO_C4", "android", R.string.mediasize_iso_c4, 9020, 12760); /** ISO C5 media size: 162mm x 229mm (6.38" x 9.02") */ public static final MediaSize ISO_C5 = - new MediaSize("ISO_C5", "android", R.string.mediaSize_iso_c5, 6380, 9020); + new MediaSize("ISO_C5", "android", R.string.mediasize_iso_c5, 6380, 9020); /** ISO C6 media size: 114mm x 162mm (4.49" x 6.38") */ public static final MediaSize ISO_C6 = - new MediaSize("ISO_C6", "android", R.string.mediaSize_iso_c6, 4490, 6380); + new MediaSize("ISO_C6", "android", R.string.mediasize_iso_c6, 4490, 6380); /** ISO C7 media size: 81mm x 114mm (3.19" x 4.49") */ public static final MediaSize ISO_C7 = - new MediaSize("ISO_C7", "android", R.string.mediaSize_iso_c7, 3190, 4490); + new MediaSize("ISO_C7", "android", R.string.mediasize_iso_c7, 3190, 4490); /** ISO C8 media size: 57mm x 81mm (2.24" x 3.19") */ public static final MediaSize ISO_C8 = - new MediaSize("ISO_C8", "android", R.string.mediaSize_iso_c8, 2240, 3190); + new MediaSize("ISO_C8", "android", R.string.mediasize_iso_c8, 2240, 3190); /** ISO C9 media size: 40mm x 57mm (1.57" x 2.24") */ public static final MediaSize ISO_C9 = - new MediaSize("ISO_C9", "android", R.string.mediaSize_iso_c9, 1570, 2240); + new MediaSize("ISO_C9", "android", R.string.mediasize_iso_c9, 1570, 2240); /** ISO C10 media size: 28mm x 40mm (1.10" x 1.57") */ public static final MediaSize ISO_C10 = - new MediaSize("ISO_C10", "android", R.string.mediaSize_iso_c10, 1100, 1570); + new MediaSize("ISO_C10", "android", R.string.mediasize_iso_c10, 1100, 1570); // North America /** North America Letter media size: 8.5" x 11" (279mm x 216mm) */ public static final MediaSize NA_LETTER = - new MediaSize("NA_LETTER", "android", R.string.mediaSize_na_letter, 8500, 11000); + new MediaSize("NA_LETTER", "android", R.string.mediasize_na_letter, 8500, 11000); /** North America Government-Letter media size: 8.0" x 10.5" (203mm x 267mm) */ public static final MediaSize NA_GOVT_LETTER = new MediaSize("NA_GOVT_LETTER", "android", - R.string.mediaSize_na_gvrnmt_letter, 8000, 10500); + R.string.mediasize_na_gvrnmt_letter, 8000, 10500); /** North America Legal media size: 8.5" x 14" (216mm x 356mm) */ public static final MediaSize NA_LEGAL = - new MediaSize("NA_LEGAL", "android", R.string.mediaSize_na_legal, 8500, 14000); + new MediaSize("NA_LEGAL", "android", R.string.mediasize_na_legal, 8500, 14000); /** North America Junior Legal media size: 8.0" x 5.0" (203mm × 127mm) */ public static final MediaSize NA_JUNIOR_LEGAL = new MediaSize("NA_JUNIOR_LEGAL", "android", - R.string.mediaSize_na_junior_legal, 8000, 5000); + R.string.mediasize_na_junior_legal, 8000, 5000); /** North America Ledger media size: 17" x 11" (432mm × 279mm) */ public static final MediaSize NA_LEDGER = - new MediaSize("NA_LEDGER", "android", R.string.mediaSize_na_ledger, 17000, 11000); + new MediaSize("NA_LEDGER", "android", R.string.mediasize_na_ledger, 17000, 11000); /** North America Tabloid media size: 11" x 17" (279mm × 432mm) */ public static final MediaSize NA_TABLOID = new MediaSize("NA_TABLOID", "android", - R.string.mediaSize_na_tabloid, 11000, 17000); + R.string.mediasize_na_tabloid, 11000, 17000); /** North America Index Card 3x5 media size: 3" x 5" (76mm x 127mm) */ public static final MediaSize NA_INDEX_3X5 = new MediaSize("NA_INDEX_3X5", "android", - R.string.mediaSize_na_index_3x5, 3000, 5000); + R.string.mediasize_na_index_3x5, 3000, 5000); /** North America Index Card 4x6 media size: 4" x 6" (102mm x 152mm) */ public static final MediaSize NA_INDEX_4X6 = new MediaSize("NA_INDEX_4X6", "android", - R.string.mediaSize_na_index_4x6, 4000, 6000); + R.string.mediasize_na_index_4x6, 4000, 6000); /** North America Index Card 5x8 media size: 5" x 8" (127mm x 203mm) */ public static final MediaSize NA_INDEX_5X8 = new MediaSize("NA_INDEX_5X8", "android", - R.string.mediaSize_na_index_5x8, 5000, 8000); + R.string.mediasize_na_index_5x8, 5000, 8000); /** North America Monarch media size: 7.25" x 10.5" (184mm x 267mm) */ public static final MediaSize NA_MONARCH = new MediaSize("NA_MONARCH", "android", - R.string.mediaSize_na_monarch, 7250, 10500); + R.string.mediasize_na_monarch, 7250, 10500); /** North America Quarto media size: 8" x 10" (203mm x 254mm) */ public static final MediaSize NA_QUARTO = new MediaSize("NA_QUARTO", "android", - R.string.mediaSize_na_quarto, 8000, 10000); + R.string.mediasize_na_quarto, 8000, 10000); /** North America Foolscap media size: 8" x 13" (203mm x 330mm) */ public static final MediaSize NA_FOOLSCAP = new MediaSize("NA_FOOLSCAP", "android", - R.string.mediaSize_na_foolscap, 8000, 13000); + R.string.mediasize_na_foolscap, 8000, 13000); // Chinese /** Chinese ROC 8K media size: 270mm x 390mm (10.629" x 15.3543") */ public static final MediaSize ROC_8K = new MediaSize("ROC_8K", "android", - R.string.mediaSize_chinese_roc_8k, 10629, 15354); + R.string.mediasize_chinese_roc_8k, 10629, 15354); /** Chinese ROC 16K media size: 195mm x 270mm (7.677" x 10.629") */ public static final MediaSize ROC_16K = new MediaSize("ROC_16K", "android", - R.string.mediaSize_chinese_roc_16k, 7677, 10629); + R.string.mediasize_chinese_roc_16k, 7677, 10629); /** Chinese PRC 1 media size: 102mm x 165mm (4.015" x 6.496") */ public static final MediaSize PRC_1 = new MediaSize("PRC_1", "android", - R.string.mediaSize_chinese_prc_1, 4015, 6496); + R.string.mediasize_chinese_prc_1, 4015, 6496); /** Chinese PRC 2 media size: 102mm x 176mm (4.015" x 6.929") */ public static final MediaSize PRC_2 = new MediaSize("PRC_2", "android", - R.string.mediaSize_chinese_prc_2, 4015, 6929); + R.string.mediasize_chinese_prc_2, 4015, 6929); /** Chinese PRC 3 media size: 125mm x 176mm (4.921" x 6.929") */ public static final MediaSize PRC_3 = new MediaSize("PRC_3", "android", - R.string.mediaSize_chinese_prc_3, 4921, 6929); + R.string.mediasize_chinese_prc_3, 4921, 6929); /** Chinese PRC 4 media size: 110mm x 208mm (4.330" x 8.189") */ public static final MediaSize PRC_4 = new MediaSize("PRC_4", "android", - R.string.mediaSize_chinese_prc_4, 4330, 8189); + R.string.mediasize_chinese_prc_4, 4330, 8189); /** Chinese PRC 5 media size: 110mm x 220mm (4.330" x 8.661") */ public static final MediaSize PRC_5 = new MediaSize("PRC_5", "android", - R.string.mediaSize_chinese_prc_5, 4330, 8661); + R.string.mediasize_chinese_prc_5, 4330, 8661); /** Chinese PRC 6 media size: 120mm x 320mm (4.724" x 12.599") */ public static final MediaSize PRC_6 = new MediaSize("PRC_6", "android", - R.string.mediaSize_chinese_prc_6, 4724, 12599); + R.string.mediasize_chinese_prc_6, 4724, 12599); /** Chinese PRC 7 media size: 160mm x 230mm (6.299" x 9.055") */ public static final MediaSize PRC_7 = new MediaSize("PRC_7", "android", - R.string.mediaSize_chinese_prc_7, 6299, 9055); + R.string.mediasize_chinese_prc_7, 6299, 9055); /** Chinese PRC 8 media size: 120mm x 309mm (4.724" x 12.165") */ public static final MediaSize PRC_8 = new MediaSize("PRC_8", "android", - R.string.mediaSize_chinese_prc_8, 4724, 12165); + R.string.mediasize_chinese_prc_8, 4724, 12165); /** Chinese PRC 9 media size: 229mm x 324mm (9.016" x 12.756") */ public static final MediaSize PRC_9 = new MediaSize("PRC_9", "android", - R.string.mediaSize_chinese_prc_9, 9016, 12756); + R.string.mediasize_chinese_prc_9, 9016, 12756); /** Chinese PRC 10 media size: 324mm x 458mm (12.756" x 18.032") */ public static final MediaSize PRC_10 = new MediaSize("PRC_10", "android", - R.string.mediaSize_chinese_prc_10, 12756, 18032); + R.string.mediasize_chinese_prc_10, 12756, 18032); /** Chinese PRC 16k media size: 146mm x 215mm (5.749" x 8.465") */ public static final MediaSize PRC_16k = new MediaSize("PRC_16k", "android", - R.string.mediaSize_chinese_prc_16k, 5749, 8465); + R.string.mediasize_chinese_prc_16k, 5749, 8465); /** Chinese Pa Kai media size: 267mm x 389mm (10.512" x 15.315") */ public static final MediaSize OM_PA_KAI = new MediaSize("OM_PA_KAI", "android", - R.string.mediaSize_chinese_om_pa_kai, 10512, 15315); + R.string.mediasize_chinese_om_pa_kai, 10512, 15315); /** Chinese Dai Pa Kai media size: 275mm x 395mm (10.827" x 15.551") */ public static final MediaSize OM_DAI_PA_KAI = new MediaSize("OM_DAI_PA_KAI", "android", - R.string.mediaSize_chinese_om_dai_pa_kai, 10827, 15551); + R.string.mediasize_chinese_om_dai_pa_kai, 10827, 15551); /** Chinese Jurro Ku Kai media size: 198mm x 275mm (7.796" x 10.827") */ public static final MediaSize OM_JUURO_KU_KAI = new MediaSize("OM_JUURO_KU_KAI", "android", - R.string.mediaSize_chinese_om_jurro_ku_kai, 7796, 10827); + R.string.mediasize_chinese_om_jurro_ku_kai, 7796, 10827); // Japanese /** Japanese JIS B10 media size: 32mm x 45mm (1.259" x 1.772") */ public static final MediaSize JIS_B10 = new MediaSize("JIS_B10", "android", - R.string.mediaSize_japanese_jis_b10, 1259, 1772); + R.string.mediasize_japanese_jis_b10, 1259, 1772); /** Japanese JIS B9 media size: 45mm x 64mm (1.772" x 2.52") */ public static final MediaSize JIS_B9 = new MediaSize("JIS_B9", "android", - R.string.mediaSize_japanese_jis_b9, 1772, 2520); + R.string.mediasize_japanese_jis_b9, 1772, 2520); /** Japanese JIS B8 media size: 64mm x 91mm (2.52" x 3.583") */ public static final MediaSize JIS_B8 = new MediaSize("JIS_B8", "android", - R.string.mediaSize_japanese_jis_b8, 2520, 3583); + R.string.mediasize_japanese_jis_b8, 2520, 3583); /** Japanese JIS B7 media size: 91mm x 128mm (3.583" x 5.049") */ public static final MediaSize JIS_B7 = new MediaSize("JIS_B7", "android", - R.string.mediaSize_japanese_jis_b7, 3583, 5049); + R.string.mediasize_japanese_jis_b7, 3583, 5049); /** Japanese JIS B6 media size: 128mm x 182mm (5.049" x 7.165") */ public static final MediaSize JIS_B6 = new MediaSize("JIS_B6", "android", - R.string.mediaSize_japanese_jis_b6, 5049, 7165); + R.string.mediasize_japanese_jis_b6, 5049, 7165); /** Japanese JIS B5 media size: 182mm x 257mm (7.165" x 10.118") */ public static final MediaSize JIS_B5 = new MediaSize("JIS_B5", "android", - R.string.mediaSize_japanese_jis_b5, 7165, 10118); + R.string.mediasize_japanese_jis_b5, 7165, 10118); /** Japanese JIS B4 media size: 257mm x 364mm (10.118" x 14.331") */ public static final MediaSize JIS_B4 = new MediaSize("JIS_B4", "android", - R.string.mediaSize_japanese_jis_b4, 10118, 14331); + R.string.mediasize_japanese_jis_b4, 10118, 14331); /** Japanese JIS B3 media size: 364mm x 515mm (14.331" x 20.276") */ public static final MediaSize JIS_B3 = new MediaSize("JIS_B3", "android", - R.string.mediaSize_japanese_jis_b3, 14331, 20276); + R.string.mediasize_japanese_jis_b3, 14331, 20276); /** Japanese JIS B2 media size: 515mm x 728mm (20.276" x 28.661") */ public static final MediaSize JIS_B2 = new MediaSize("JIS_B2", "android", - R.string.mediaSize_japanese_jis_b2, 20276, 28661); + R.string.mediasize_japanese_jis_b2, 20276, 28661); /** Japanese JIS B1 media size: 728mm x 1030mm (28.661" x 40.551") */ public static final MediaSize JIS_B1 = new MediaSize("JIS_B1", "android", - R.string.mediaSize_japanese_jis_b1, 28661, 40551); + R.string.mediasize_japanese_jis_b1, 28661, 40551); /** Japanese JIS B0 media size: 1030mm x 1456mm (40.551" x 57.323") */ public static final MediaSize JIS_B0 = new MediaSize("JIS_B0", "android", - R.string.mediaSize_japanese_jis_b0, 40551, 57323); + R.string.mediasize_japanese_jis_b0, 40551, 57323); /** Japanese JIS Exec media size: 216mm x 330mm (8.504" x 12.992") */ public static final MediaSize JIS_EXEC = new MediaSize("JIS_EXEC", "android", - R.string.mediaSize_japanese_jis_exec, 8504, 12992); + R.string.mediasize_japanese_jis_exec, 8504, 12992); /** Japanese Chou4 media size: 90mm x 205mm (3.543" x 8.071") */ public static final MediaSize JPN_CHOU4 = new MediaSize("JPN_CHOU4", "android", - R.string.mediaSize_japanese_chou4, 3543, 8071); + R.string.mediasize_japanese_chou4, 3543, 8071); /** Japanese Chou3 media size: 120mm x 235mm (4.724" x 9.252") */ public static final MediaSize JPN_CHOU3 = new MediaSize("JPN_CHOU3", "android", - R.string.mediaSize_japanese_chou3, 4724, 9252); + R.string.mediasize_japanese_chou3, 4724, 9252); /** Japanese Chou2 media size: 111.1mm x 146mm (4.374" x 5.748") */ public static final MediaSize JPN_CHOU2 = new MediaSize("JPN_CHOU2", "android", - R.string.mediaSize_japanese_chou2, 4374, 5748); + R.string.mediasize_japanese_chou2, 4374, 5748); /** Japanese Hagaki media size: 100mm x 148mm (3.937" x 5.827") */ public static final MediaSize JPN_HAGAKI = new MediaSize("JPN_HAGAKI", "android", - R.string.mediaSize_japanese_hagaki, 3937, 5827); + R.string.mediasize_japanese_hagaki, 3937, 5827); /** Japanese Oufuku media size: 148mm x 200mm (5.827" x 7.874") */ public static final MediaSize JPN_OUFUKU = new MediaSize("JPN_OUFUKU", "android", - R.string.mediaSize_japanese_oufuku, 5827, 7874); + R.string.mediasize_japanese_oufuku, 5827, 7874); /** Japanese Kahu media size: 240mm x 322.1mm (9.449" x 12.681") */ public static final MediaSize JPN_KAHU = new MediaSize("JPN_KAHU", "android", - R.string.mediaSize_japanese_kahu, 9449, 12681); + R.string.mediasize_japanese_kahu, 9449, 12681); /** Japanese Kaku2 media size: 240mm x 332mm (9.449" x 13.071") */ public static final MediaSize JPN_KAKU2 = new MediaSize("JPN_KAKU2", "android", - R.string.mediaSize_japanese_kaku2, 9449, 13071); + R.string.mediasize_japanese_kaku2, 9449, 13071); /** Japanese You4 media size: 105mm x 235mm (4.134" x 9.252") */ public static final MediaSize JPN_YOU4 = new MediaSize("JPN_YOU4", "android", - R.string.mediaSize_japanese_you4, 4134, 9252); + R.string.mediasize_japanese_you4, 4134, 9252); private final String mId; /**@hide */ @@ -634,7 +656,8 @@ public final class PrintAttributes implements Parcelable { /** * Creates a new instance. * - * @param id The unique media size id. + * @param id The unique media size id. It is unique amongst other media sizes + * supported by the printer. * @param label The <strong>internationalized</strong> human readable label. * @param widthMils The width in mils (thousands of an inch). * @param heightMils The height in mils (thousands of an inch). @@ -679,7 +702,12 @@ public final class PrintAttributes implements Parcelable { } /** - * Gets the unique media size id. + * Gets the unique media size id. It is unique amongst other media sizes + * supported by the printer. + * <p> + * This id is defined by the client that generated the media size + * instance and should not be interpreted by other parties. + * </p> * * @return The unique media size id. */ @@ -829,7 +857,11 @@ public final class PrintAttributes implements Parcelable { } /** - * This class specifies a supported resolution in dpi (dots per inch). + * This class specifies a supported resolution in DPI (dots per inch). + * Resolution defines how many points with different color can be placed + * on one inch in horizontal or vertical direction of the target media. + * For example, a printer with 600DIP can produce higher quality images + * the one with 300DPI resolution. */ public static final class Resolution { private final String mId; @@ -840,10 +872,11 @@ public final class PrintAttributes implements Parcelable { /** * Creates a new instance. * - * @param id The unique resolution id. + * @param id The unique resolution id. It is unique amongst other resolutions + * supported by the printer. * @param label The <strong>internationalized</strong> human readable label. - * @param horizontalDpi The horizontal resolution in dpi. - * @param verticalDpi The vertical resolution in dpi. + * @param horizontalDpi The horizontal resolution in DPI (dots per inch). + * @param verticalDpi The vertical resolution in DPI (dots per inch). * * @throws IllegalArgumentException If the id is empty. * @throws IllegalArgumentException If the label is empty. @@ -872,7 +905,12 @@ public final class PrintAttributes implements Parcelable { } /** - * Gets the unique resolution id. + * Gets the unique resolution id. It is unique amongst other resolutions + * supported by the printer. + * <p> + * This id is defined by the client that generated the resolution + * instance and should not be interpreted by other parties. + * </p> * * @return The unique resolution id. */ @@ -890,7 +928,7 @@ public final class PrintAttributes implements Parcelable { } /** - * Gets the vertical resolution in dpi. + * Gets the horizontal resolution in DPI (dots per inch). * * @return The horizontal resolution. */ @@ -899,7 +937,7 @@ public final class PrintAttributes implements Parcelable { } /** - * Gets the vertical resolution in dpi. + * Gets the vertical resolution in DPI (dots per inch). * * @return The vertical resolution. */ @@ -966,7 +1004,9 @@ public final class PrintAttributes implements Parcelable { } /** - * This class specifies content margins. + * This class specifies content margins. Margins define the white space + * around the content where the left margin defines the amount of white + * space on the left of the content and so on. */ public static final class Margins { public static final Margins NO_MARGINS = new Margins(0, 0, 0, 0); diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 20fb1a7d9703..db1152995b3c 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -1673,6 +1673,22 @@ public class WebView extends AbsoluteLayout } /** + * Enables debugging of web contents (HTML / CSS / JavaScript) + * loaded into any WebViews of this application. This flag can be enabled + * in order to facilitate debugging of web layouts and JavaScript + * code running inside WebViews. Please refer to WebView documentation + * for the debugging guide. + * + * The default is false. + * + * @param enabled whether to enable web contents debugging + */ + public static void setWebContentsDebuggingEnabled(boolean enabled) { + checkThread(); + getFactory().getStatics().setWebContentsDebuggingEnabled(enabled); + } + + /** * Gets the list of currently loaded plugins. * * @return the list of currently loaded plugins diff --git a/core/java/android/webkit/WebViewClassic.java b/core/java/android/webkit/WebViewClassic.java index e82ce30b4dd3..3c377d3eccc1 100644 --- a/core/java/android/webkit/WebViewClassic.java +++ b/core/java/android/webkit/WebViewClassic.java @@ -1361,6 +1361,11 @@ public final class WebViewClassic implements WebViewProvider, WebViewProvider.Sc return WebSettingsClassic.getDefaultUserAgentForLocale(context, Locale.getDefault()); } + + @Override + public void setWebContentsDebuggingEnabled(boolean enable) { + // no-op for WebViewClassic. + } } private void onHandleUiEvent(MotionEvent event, int eventType, int flags) { diff --git a/core/java/android/webkit/WebViewFactoryProvider.java b/core/java/android/webkit/WebViewFactoryProvider.java index 934ef83db185..9d9d88292c1a 100644 --- a/core/java/android/webkit/WebViewFactoryProvider.java +++ b/core/java/android/webkit/WebViewFactoryProvider.java @@ -48,6 +48,12 @@ public interface WebViewFactoryProvider { * {@link android.webkit.WebSettings#getDefaultUserAgent(Context) } */ String getDefaultUserAgent(Context context); + + /** + * Implements the API method: + * {@link android.webkit.WebView#setWebContentsDebuggingEnabled(boolean) } + */ + void setWebContentsDebuggingEnabled(boolean enable); } Statics getStatics(); diff --git a/packages/PrintSpooler/res/drawable-hdpi/stat_notify_print.png b/core/res/res/drawable-hdpi/ic_print.png Binary files differindex aaff3ddb0e46..aaff3ddb0e46 100644 --- a/packages/PrintSpooler/res/drawable-hdpi/stat_notify_print.png +++ b/core/res/res/drawable-hdpi/ic_print.png diff --git a/packages/PrintSpooler/res/drawable-mdpi/stat_notify_print.png b/core/res/res/drawable-mdpi/ic_print.png Binary files differindex a3954b544e00..a3954b544e00 100644 --- a/packages/PrintSpooler/res/drawable-mdpi/stat_notify_print.png +++ b/core/res/res/drawable-mdpi/ic_print.png diff --git a/packages/PrintSpooler/res/drawable-xhdpi/stat_notify_print.png b/core/res/res/drawable-xhdpi/ic_print.png Binary files differindex 6b55a14d142f..6b55a14d142f 100644 --- a/packages/PrintSpooler/res/drawable-xhdpi/stat_notify_print.png +++ b/core/res/res/drawable-xhdpi/ic_print.png diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 957d41e8db32..c57873e983df 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -4238,178 +4238,183 @@ <!-- Printing --> <!-- ISO (European standard) A0 media (paper) size: 33.11" × 46.81" --> - <string name="mediaSize_iso_a0">ISO A0</string> + <string name="mediasize_iso_a0">ISO A0</string> <!-- ISO (European standard) A1 media (paper) size: 23.39" × 33.11" --> - <string name="mediaSize_iso_a1">ISO A1</string> + <string name="mediasize_iso_a1">ISO A1</string> <!-- ISO (European standard) A2 media (paper) size: 16.54" x 23.39" --> - <string name="mediaSize_iso_a2">ISO A2</string> + <string name="mediasize_iso_a2">ISO A2</string> <!-- ISO (European standard) A3 media (paper) size: 11.69" x 16.54" --> - <string name="mediaSize_iso_a3">ISO A3</string> + <string name="mediasize_iso_a3">ISO A3</string> <!-- ISO (European standard) A4 media (paper) size: 8.27" x 11.69" --> - <string name="mediaSize_iso_a4">ISO A4</string> + <string name="mediasize_iso_a4">ISO A4</string> <!-- ISO (European standard) A5 media (paper) size: 5.83" x 8.27" --> - <string name="mediaSize_iso_a5">ISO A5</string> + <string name="mediasize_iso_a5">ISO A5</string> <!-- ISO (European standard) A6 media (paper) size: 4.13" x 5.83" --> - <string name="mediaSize_iso_a6">ISO A6</string> + <string name="mediasize_iso_a6">ISO A6</string> <!-- ISO (European standard) A7 media (paper) size: 2.91" x 4.13" --> - <string name="mediaSize_iso_a7">ISO A7</string> + <string name="mediasize_iso_a7">ISO A7</string> <!-- ISO (European standard) A8 media (paper) size: 2.05" x 2.91" --> - <string name="mediaSize_iso_a8">ISO A8</string> + <string name="mediasize_iso_a8">ISO A8</string> <!-- ISO (European standard) A9 media (paper) size: 1.46" x 2.05" --> - <string name="mediaSize_iso_a9">ISO A9</string> + <string name="mediasize_iso_a9">ISO A9</string> <!-- ISO (European standard) A10 media (paper) size: 1.02" x 1.46" --> - <string name="mediaSize_iso_a10">ISO A10</string> + <string name="mediasize_iso_a10">ISO A10</string> <!-- ISO (European standard) B0 media (paper) size: 39.37" x 55.67" --> - <string name="mediaSize_iso_b0">ISO B0</string> + <string name="mediasize_iso_b0">ISO B0</string> <!-- ISO (European standard) B1 media (paper) size: 27.83" x 39.37" --> - <string name="mediaSize_iso_b1">ISO B1</string> + <string name="mediasize_iso_b1">ISO B1</string> <!-- ISO (European standard) B2 media (paper) size - 19.69" x 27.83" --> - <string name="mediaSize_iso_b2">ISO B2</string> + <string name="mediasize_iso_b2">ISO B2</string> <!-- ISO (European standard) B3 media (paper) size: 13.90" x 19.69" --> - <string name="mediaSize_iso_b3">ISO B3</string> + <string name="mediasize_iso_b3">ISO B3</string> <!-- ISO (European standard) B4 media (paper) size: 9.84" x 13.90" --> - <string name="mediaSize_iso_b4">ISO B4</string> + <string name="mediasize_iso_b4">ISO B4</string> <!-- ISO (European standard) B5 media (paper) size: 6.93" x 9.84" --> - <string name="mediaSize_iso_b5">ISO B5</string> + <string name="mediasize_iso_b5">ISO B5</string> <!-- ISO (European standard) B6 media (paper) size: 4.92" x 6.93" --> - <string name="mediaSize_iso_b6">ISO B6</string> + <string name="mediasize_iso_b6">ISO B6</string> <!-- ISO (European standard) B7 media (paper) size: 3.46" x 4.92" --> - <string name="mediaSize_iso_b7">ISO B7</string> + <string name="mediasize_iso_b7">ISO B7</string> <!-- ISO (European standard) B8 media (paper) size: 2.44" x 3.46" --> - <string name="mediaSize_iso_b8">ISO B8</string> + <string name="mediasize_iso_b8">ISO B8</string> <!-- ISO (European standard) B9 media (paper) size: 1.73" x 2.44" --> - <string name="mediaSize_iso_b9">ISO B9</string> + <string name="mediasize_iso_b9">ISO B9</string> <!-- ISO (European standard) B10 media (paper) size: 1.22" x 1.73" --> - <string name="mediaSize_iso_b10">ISO B10</string> + <string name="mediasize_iso_b10">ISO B10</string> <!-- ISO (European standard) C0 media (paper) size: 36.10" x 51.06" --> - <string name="mediaSize_iso_c0">ISO C0</string> + <string name="mediasize_iso_c0">ISO C0</string> <!-- ISO (European standard) C1 media (paper) size: 25.51" x 36.10" --> - <string name="mediaSize_iso_c1">ISO C1</string> + <string name="mediasize_iso_c1">ISO C1</string> <!-- ISO (European standard) C2 media (paper) size: 18.03" x 25.51" --> - <string name="mediaSize_iso_c2">ISO C2</string> + <string name="mediasize_iso_c2">ISO C2</string> <!-- ISO (European standard) C3 media (paper) size: 12.76" x 18.03" --> - <string name="mediaSize_iso_c3">ISO C3</string> + <string name="mediasize_iso_c3">ISO C3</string> <!-- ISO (European standard) C4 media (paper) size: 9.02" x 12.76" --> - <string name="mediaSize_iso_c4">ISO C4</string> + <string name="mediasize_iso_c4">ISO C4</string> <!-- ISO (European standard) C5 media (paper) size: 6.38" x 9.02" --> - <string name="mediaSize_iso_c5">ISO C5</string> + <string name="mediasize_iso_c5">ISO C5</string> <!-- ISO (European standard) C6 media (paper) size: 4.49" x 6.38" --> - <string name="mediaSize_iso_c6">ISO C6</string> + <string name="mediasize_iso_c6">ISO C6</string> <!-- ISO (European standard) C7 media (paper) size: 3.19" x 4.49" --> - <string name="mediaSize_iso_c7">ISO C7</string> + <string name="mediasize_iso_c7">ISO C7</string> <!-- ISO ISO C8 media (paper) size: 2.24" x 3.19" --> - <string name="mediaSize_iso_c8">ISO C8</string> + <string name="mediasize_iso_c8">ISO C8</string> <!-- ISO ISO C9 media (paper) size: 1.57" x 2.24" --> - <string name="mediaSize_iso_c9">ISO C9</string> + <string name="mediasize_iso_c9">ISO C9</string> <!-- ISO (European standard) C10 media (paper) size: 1.10" x 1.57" --> - <string name="mediaSize_iso_c10">ISO C10</string> + <string name="mediasize_iso_c10">ISO C10</string> <!-- North America Letter media (paper) size: 8.5" × 11" (279mm x 216mm) --> - <string name="mediaSize_na_letter">Letter</string> + <string name="mediasize_na_letter">Letter</string> <!-- North America Government Letter media (paper) size: 8.0" × 10.5" (203mm x 267mm) --> - <string name="mediaSize_na_gvrnmt_letter">Government Letter</string> + <string name="mediasize_na_gvrnmt_letter">Government Letter</string> <!-- North America Legal media (paper) size: 8.5" × 14" (216mm x 356mm) --> - <string name="mediaSize_na_legal">Legal</string> + <string name="mediasize_na_legal">Legal</string> <!-- North America Junior Legal media (paper) size: 8.0" × 5.0" (203mm × 127mm) --> - <string name="mediaSize_na_junior_legal">Junior Legal</string> + <string name="mediasize_na_junior_legal">Junior Legal</string> <!-- North America Ledger media (paper) size: 17" × 11" (432mm × 279mm) --> - <string name="mediaSize_na_ledger">Ledger</string> + <string name="mediasize_na_ledger">Ledger</string> <!-- North America Tabloid media (paper) size: 11" × 17" (279mm × 432mm) --> - <string name="mediaSize_na_tabloid">Tabloid</string> + <string name="mediasize_na_tabloid">Tabloid</string> <!-- North America Index Card 3x5 media (paper) size: 3" x 5" (76mm x 127mm) --> - <string name="mediaSize_na_index_3x5">Index Card 3x5</string> + <string name="mediasize_na_index_3x5">Index Card 3x5</string> <!-- North America Index Card 4x6 media (paper) size: 4" x 6" (102mm x 152mm) --> - <string name="mediaSize_na_index_4x6">Index Card 4x6</string> + <string name="mediasize_na_index_4x6">Index Card 4x6</string> <!-- North America Index Card 5x8 media (paper) size: 5" x 8" (127mm x 203mm) --> - <string name="mediaSize_na_index_5x8">Index Card 5x8</string> + <string name="mediasize_na_index_5x8">Index Card 5x8</string> <!-- North America Monarch media (paper) size: 7.25" x 10.5" (184mm x 267mm) --> - <string name="mediaSize_na_monarch">Monarch</string> + <string name="mediasize_na_monarch">Monarch</string> <!-- North America Quarto media (paper) size: 8" x 10" (203mm x 254mm) --> - <string name="mediaSize_na_quarto">Quarto</string> + <string name="mediasize_na_quarto">Quarto</string> <!-- North America Foolscap media (paper) size: 8" x 13" (203mm x 330mm) --> - <string name="mediaSize_na_foolscap">Foolscap</string> + <string name="mediasize_na_foolscap">Foolscap</string> <!-- Chinese Roc 8k media (paper) size: 270mm x 390mm (10.629" x 15.3543") --> - <string name="mediaSize_chinese_roc_8k">ROC 8K</string> + <string name="mediasize_chinese_roc_8k">ROC 8K</string> <!-- Chinese Roc 16k media (paper) size: 195mm x 270mm (7.677" x 10.629") --> - <string name="mediaSize_chinese_roc_16k">ROC 16K</string> + <string name="mediasize_chinese_roc_16k">ROC 16K</string> <!-- Chinese PRC 1 media (paper) size: 102mm x 165mm (4.015" x 6.496") --> - <string name="mediaSize_chinese_prc_1">PRC 1</string> + <string name="mediasize_chinese_prc_1">PRC 1</string> <!-- Chinese PRC 2 media (paper) size: 102mm x 176mm (4.015" x 6.929") --> - <string name="mediaSize_chinese_prc_2">PRC 2</string> + <string name="mediasize_chinese_prc_2">PRC 2</string> <!-- Chinese PRC 3 media (paper) size: 125mm x 176mm (4.921" x 6.929") --> - <string name="mediaSize_chinese_prc_3">PRC 3</string> + <string name="mediasize_chinese_prc_3">PRC 3</string> <!-- Chinese PRC 4 media (paper) size: 110mm x 208mm (4.330" x 8.189") --> - <string name="mediaSize_chinese_prc_4">PRC 4</string> + <string name="mediasize_chinese_prc_4">PRC 4</string> <!-- Chinese PRC 5 media (paper) size: 110mm x 220mm (4.330" x 8.661") --> - <string name="mediaSize_chinese_prc_5">PRC 5</string> + <string name="mediasize_chinese_prc_5">PRC 5</string> <!-- Chinese PRC 6 media (paper) size: 120mm x 320mm (4.724" x 12.599") --> - <string name="mediaSize_chinese_prc_6">PRC 6</string> + <string name="mediasize_chinese_prc_6">PRC 6</string> <!-- Chinese PRC 7 media (paper) size: 160mm x 230mm (6.299" x 9.055") --> - <string name="mediaSize_chinese_prc_7">PRC 7</string> + <string name="mediasize_chinese_prc_7">PRC 7</string> <!-- Chinese PRC 8 media (paper) size: 120mm x 309mm (4.724" x 12.165") --> - <string name="mediaSize_chinese_prc_8">PRC 8</string> + <string name="mediasize_chinese_prc_8">PRC 8</string> <!-- Chinese PRC 9 media (paper) size: 229mm x 324mm (9.016" x 12.756") --> - <string name="mediaSize_chinese_prc_9">PRC 9</string> + <string name="mediasize_chinese_prc_9">PRC 9</string> <!-- Chinese PRC 10 media (paper) size: 324mm x 458mm (12.756" x 18.032") --> - <string name="mediaSize_chinese_prc_10">PRC 10</string> + <string name="mediasize_chinese_prc_10">PRC 10</string> <!-- Chinese RPC 16K media (paper) size: 146mm x 215mm (5.749" x 8.465") --> - <string name="mediaSize_chinese_prc_16k">PRC 16K</string> + <string name="mediasize_chinese_prc_16k">PRC 16K</string> <!-- Chinese Pa Kai media (paper) size: 146mm x 215mm (5.749" x 8.465") --> - <string name="mediaSize_chinese_om_pa_kai">Pa Kai</string> + <string name="mediasize_chinese_om_pa_kai">Pa Kai</string> <!-- Chinese Dai Pa Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") --> - <string name="mediaSize_chinese_om_dai_pa_kai">Dai Pa Kai</string> + <string name="mediasize_chinese_om_dai_pa_kai">Dai Pa Kai</string> <!-- Chinese Jurro Ku Kai media (paper) size: 275mm x 395mm (10.827" x 15.551") --> - <string name="mediaSize_chinese_om_jurro_ku_kai">Jurro Ku Kai</string> + <string name="mediasize_chinese_om_jurro_ku_kai">Jurro Ku Kai</string> <!-- Japanese JIS B10 media (paper) size: 32mm x 45mm (1.259" x 1.772") --> - <string name="mediaSize_japanese_jis_b10">JIS B10</string> + <string name="mediasize_japanese_jis_b10">JIS B10</string> <!-- Japanese JIS B9 media (paper) size: 45mm x 64mm (1.772" x 2.52") --> - <string name="mediaSize_japanese_jis_b9">JIS B9</string> + <string name="mediasize_japanese_jis_b9">JIS B9</string> <!-- Japanese JIS B8 media (paper) size: 64mm x 91mm (2.52" x 3.583") --> - <string name="mediaSize_japanese_jis_b8">JIS B8</string> + <string name="mediasize_japanese_jis_b8">JIS B8</string> <!-- Japanese JIS B7 media (paper) size: 91mm x 128mm (3.583" x 5.049") --> - <string name="mediaSize_japanese_jis_b7">JIS B7</string> + <string name="mediasize_japanese_jis_b7">JIS B7</string> <!-- Japanese JIS B6 media (paper) size: 128mm x 182mm (5.049" x 7.165") --> - <string name="mediaSize_japanese_jis_b6">JIS B6</string> + <string name="mediasize_japanese_jis_b6">JIS B6</string> <!-- Japanese JIS B5 media (paper) size: 182mm x 257mm (7.165" x 10.118") --> - <string name="mediaSize_japanese_jis_b5">JIS B5</string> + <string name="mediasize_japanese_jis_b5">JIS B5</string> <!-- Japanese JIS B4 media (paper) size: 257mm x 364mm (10.118" x 14.331") --> - <string name="mediaSize_japanese_jis_b4">JIS B4</string> + <string name="mediasize_japanese_jis_b4">JIS B4</string> <!-- Japanese JIS B3 media (paper) size: 364mm x 515mm (14.331" x 20.276") --> - <string name="mediaSize_japanese_jis_b3">JIS B3</string> + <string name="mediasize_japanese_jis_b3">JIS B3</string> <!-- Japanese JIS B2 media (paper) size: 515mm x 728mm (20.276" x 28.661") --> - <string name="mediaSize_japanese_jis_b2">JIS B2</string> + <string name="mediasize_japanese_jis_b2">JIS B2</string> <!-- Japanese JIS B1 media (paper) size: 728mm x 1030mm (28.661" x 40.551") --> - <string name="mediaSize_japanese_jis_b1">JIS B1</string> + <string name="mediasize_japanese_jis_b1">JIS B1</string> <!-- Japanese JIS B0 media (paper) size: 1030mm x 1456mm (40.551" x 57.323") --> - <string name="mediaSize_japanese_jis_b0">JIS B0</string> + <string name="mediasize_japanese_jis_b0">JIS B0</string> <!-- Japanese JIS Exec media (paper) size: 216mm x 330mm (8.504" x 12.992") --> - <string name="mediaSize_japanese_jis_exec">JIS Exec</string> + <string name="mediasize_japanese_jis_exec">JIS Exec</string> <!-- Japanese Chou4 media (paper) size: 90mm x 205mm (3.543" x 8.071") --> - <string name="mediaSize_japanese_chou4">Chou4</string> + <string name="mediasize_japanese_chou4">Chou4</string> <!-- Japanese Chou3 media (paper) size: 120mm x 235mm (4.724" x 9.252") --> - <string name="mediaSize_japanese_chou3">Chou3</string> + <string name="mediasize_japanese_chou3">Chou3</string> <!-- Japanese Chou2 media (paper) size: 111.1mm x 146mm (4.374" x 5.748") --> - <string name="mediaSize_japanese_chou2">Chou2</string> + <string name="mediasize_japanese_chou2">Chou2</string> <!-- Japanese Hagaki media (paper) size: 100mm x 148mm (3.937" x 5.827") --> - <string name="mediaSize_japanese_hagaki">Hagaki </string> + <string name="mediasize_japanese_hagaki">Hagaki </string> <!-- Japanese Oufuku media (paper) size: 148mm x 200mm (5.827" x 7.874") --> - <string name="mediaSize_japanese_oufuku">Oufuku </string> + <string name="mediasize_japanese_oufuku">Oufuku </string> <!-- Japanese Kahu media (paper) size: 240mm x 322.1mm (9.449" x 12.681") --> - <string name="mediaSize_japanese_kahu">Kahu</string> + <string name="mediasize_japanese_kahu">Kahu</string> <!-- Japanese Kaku2 media (paper) size: 240mm x 332mm (9.449" x 13.071") --> - <string name="mediaSize_japanese_kaku2">Kaku2</string> + <string name="mediasize_japanese_kaku2">Kaku2</string> <!-- Japanese You4 media (paper) size: 105mm x 235mm (4.134" x 9.252") --> - <string name="mediaSize_japanese_you4">You4</string> + <string name="mediasize_japanese_you4">You4</string> + + <!-- Media (paper) size for specifying any paper size in portrait.--> + <string name="mediasize_unknown_portrait">Unknown portrait</string> + <!-- Media (paper) size for specifying any paper size in landscape.--> + <string name="mediasize_unknown_landscape">Unknown landscape</string> <!-- Write fail reason: printing was cancelled.[CHAR LIMIT=none] --> <string name="write_fail_reason_cancelled">Cancelled</string> @@ -4419,6 +4424,11 @@ <!-- Print fail reason: unknown. [CHAR LIMIT=25] --> <string name="reason_unknown">unknown</string> + <!-- Title for the notification that a print service was installed. [CHAR LIMIT=50] --> + <string name="print_service_installed_title"><xliff:g id="name" example="Cloud Print">%s</xliff:g> service installed</string> + <!-- Message for the notification that a print service was installed. [CHAR LIMIT=50] --> + <string name="print_service_installed_message">Tap to enable</string> + <!-- PIN entry dialog title for entering the administrator PIN [CHAR LIMIT=none] --> <string name="restr_pin_enter_admin_pin">Enter administrator PIN</string> <!-- PIN entry dialog label/hint for PIN [CHAR LIMIT=none] --> diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml index a491612362d9..8370b9f671f6 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -675,6 +675,8 @@ <java-symbol type="string" name="power_off" /> <java-symbol type="string" name="preposition_for_date" /> <java-symbol type="string" name="preposition_for_time" /> + <java-symbol type="string" name="print_service_installed_title" /> + <java-symbol type="string" name="print_service_installed_message" /> <java-symbol type="string" name="progress_erasing" /> <java-symbol type="string" name="progress_unmounting" /> <java-symbol type="string" name="mobile_provisioning_apn" /> @@ -840,87 +842,89 @@ <java-symbol type="string" name="action_bar_home_description_format" /> <java-symbol type="string" name="action_bar_home_subtitle_description_format" /> <java-symbol type="string" name="wireless_display_route_description" /> - <java-symbol type="string" name="mediaSize_iso_a0" /> - <java-symbol type="string" name="mediaSize_iso_a1" /> - <java-symbol type="string" name="mediaSize_iso_a2" /> - <java-symbol type="string" name="mediaSize_iso_a3" /> - <java-symbol type="string" name="mediaSize_iso_a4" /> - <java-symbol type="string" name="mediaSize_iso_a5" /> - <java-symbol type="string" name="mediaSize_iso_a6" /> - <java-symbol type="string" name="mediaSize_iso_a7" /> - <java-symbol type="string" name="mediaSize_iso_a8" /> - <java-symbol type="string" name="mediaSize_iso_a9" /> - <java-symbol type="string" name="mediaSize_iso_a10" /> - <java-symbol type="string" name="mediaSize_iso_b0" /> - <java-symbol type="string" name="mediaSize_iso_b1" /> - <java-symbol type="string" name="mediaSize_iso_b2" /> - <java-symbol type="string" name="mediaSize_iso_b3" /> - <java-symbol type="string" name="mediaSize_iso_b4" /> - <java-symbol type="string" name="mediaSize_iso_b5" /> - <java-symbol type="string" name="mediaSize_iso_b6" /> - <java-symbol type="string" name="mediaSize_iso_b7" /> - <java-symbol type="string" name="mediaSize_iso_b8" /> - <java-symbol type="string" name="mediaSize_iso_b9" /> - <java-symbol type="string" name="mediaSize_iso_b10" /> - <java-symbol type="string" name="mediaSize_iso_c0" /> - <java-symbol type="string" name="mediaSize_iso_c1" /> - <java-symbol type="string" name="mediaSize_iso_c2" /> - <java-symbol type="string" name="mediaSize_iso_c3" /> - <java-symbol type="string" name="mediaSize_iso_c4" /> - <java-symbol type="string" name="mediaSize_iso_c5" /> - <java-symbol type="string" name="mediaSize_iso_c6" /> - <java-symbol type="string" name="mediaSize_iso_c7" /> - <java-symbol type="string" name="mediaSize_iso_c8" /> - <java-symbol type="string" name="mediaSize_iso_c9" /> - <java-symbol type="string" name="mediaSize_iso_c10" /> - <java-symbol type="string" name="mediaSize_na_letter" /> - <java-symbol type="string" name="mediaSize_na_gvrnmt_letter" /> - <java-symbol type="string" name="mediaSize_na_legal" /> - <java-symbol type="string" name="mediaSize_na_junior_legal" /> - <java-symbol type="string" name="mediaSize_na_ledger" /> - <java-symbol type="string" name="mediaSize_na_tabloid" /> - <java-symbol type="string" name="mediaSize_na_index_3x5" /> - <java-symbol type="string" name="mediaSize_na_index_4x6" /> - <java-symbol type="string" name="mediaSize_na_index_5x8" /> - <java-symbol type="string" name="mediaSize_na_monarch" /> - <java-symbol type="string" name="mediaSize_na_quarto" /> - <java-symbol type="string" name="mediaSize_na_foolscap" /> - <java-symbol type="string" name="mediaSize_chinese_roc_8k" /> - <java-symbol type="string" name="mediaSize_chinese_roc_16k" /> - <java-symbol type="string" name="mediaSize_chinese_prc_1" /> - <java-symbol type="string" name="mediaSize_chinese_prc_2" /> - <java-symbol type="string" name="mediaSize_chinese_prc_3" /> - <java-symbol type="string" name="mediaSize_chinese_prc_4" /> - <java-symbol type="string" name="mediaSize_chinese_prc_5" /> - <java-symbol type="string" name="mediaSize_chinese_prc_6" /> - <java-symbol type="string" name="mediaSize_chinese_prc_7" /> - <java-symbol type="string" name="mediaSize_chinese_prc_8" /> - <java-symbol type="string" name="mediaSize_chinese_prc_9" /> - <java-symbol type="string" name="mediaSize_chinese_prc_10" /> - <java-symbol type="string" name="mediaSize_chinese_prc_16k" /> - <java-symbol type="string" name="mediaSize_chinese_om_pa_kai" /> - <java-symbol type="string" name="mediaSize_chinese_om_dai_pa_kai" /> - <java-symbol type="string" name="mediaSize_chinese_om_jurro_ku_kai" /> - <java-symbol type="string" name="mediaSize_japanese_jis_b10" /> - <java-symbol type="string" name="mediaSize_japanese_jis_b9" /> - <java-symbol type="string" name="mediaSize_japanese_jis_b8" /> - <java-symbol type="string" name="mediaSize_japanese_jis_b7" /> - <java-symbol type="string" name="mediaSize_japanese_jis_b6" /> - <java-symbol type="string" name="mediaSize_japanese_jis_b5" /> - <java-symbol type="string" name="mediaSize_japanese_jis_b4" /> - <java-symbol type="string" name="mediaSize_japanese_jis_b3" /> - <java-symbol type="string" name="mediaSize_japanese_jis_b2" /> - <java-symbol type="string" name="mediaSize_japanese_jis_b1" /> - <java-symbol type="string" name="mediaSize_japanese_jis_b0" /> - <java-symbol type="string" name="mediaSize_japanese_jis_exec" /> - <java-symbol type="string" name="mediaSize_japanese_chou4" /> - <java-symbol type="string" name="mediaSize_japanese_chou3" /> - <java-symbol type="string" name="mediaSize_japanese_chou2" /> - <java-symbol type="string" name="mediaSize_japanese_hagaki" /> - <java-symbol type="string" name="mediaSize_japanese_oufuku" /> - <java-symbol type="string" name="mediaSize_japanese_kahu" /> - <java-symbol type="string" name="mediaSize_japanese_kaku2" /> - <java-symbol type="string" name="mediaSize_japanese_you4" /> + <java-symbol type="string" name="mediasize_unknown_portrait" /> + <java-symbol type="string" name="mediasize_unknown_landscape" /> + <java-symbol type="string" name="mediasize_iso_a0" /> + <java-symbol type="string" name="mediasize_iso_a1" /> + <java-symbol type="string" name="mediasize_iso_a2" /> + <java-symbol type="string" name="mediasize_iso_a3" /> + <java-symbol type="string" name="mediasize_iso_a4" /> + <java-symbol type="string" name="mediasize_iso_a5" /> + <java-symbol type="string" name="mediasize_iso_a6" /> + <java-symbol type="string" name="mediasize_iso_a7" /> + <java-symbol type="string" name="mediasize_iso_a8" /> + <java-symbol type="string" name="mediasize_iso_a9" /> + <java-symbol type="string" name="mediasize_iso_a10" /> + <java-symbol type="string" name="mediasize_iso_b0" /> + <java-symbol type="string" name="mediasize_iso_b1" /> + <java-symbol type="string" name="mediasize_iso_b2" /> + <java-symbol type="string" name="mediasize_iso_b3" /> + <java-symbol type="string" name="mediasize_iso_b4" /> + <java-symbol type="string" name="mediasize_iso_b5" /> + <java-symbol type="string" name="mediasize_iso_b6" /> + <java-symbol type="string" name="mediasize_iso_b7" /> + <java-symbol type="string" name="mediasize_iso_b8" /> + <java-symbol type="string" name="mediasize_iso_b9" /> + <java-symbol type="string" name="mediasize_iso_b10" /> + <java-symbol type="string" name="mediasize_iso_c0" /> + <java-symbol type="string" name="mediasize_iso_c1" /> + <java-symbol type="string" name="mediasize_iso_c2" /> + <java-symbol type="string" name="mediasize_iso_c3" /> + <java-symbol type="string" name="mediasize_iso_c4" /> + <java-symbol type="string" name="mediasize_iso_c5" /> + <java-symbol type="string" name="mediasize_iso_c6" /> + <java-symbol type="string" name="mediasize_iso_c7" /> + <java-symbol type="string" name="mediasize_iso_c8" /> + <java-symbol type="string" name="mediasize_iso_c9" /> + <java-symbol type="string" name="mediasize_iso_c10" /> + <java-symbol type="string" name="mediasize_na_letter" /> + <java-symbol type="string" name="mediasize_na_gvrnmt_letter" /> + <java-symbol type="string" name="mediasize_na_legal" /> + <java-symbol type="string" name="mediasize_na_junior_legal" /> + <java-symbol type="string" name="mediasize_na_ledger" /> + <java-symbol type="string" name="mediasize_na_tabloid" /> + <java-symbol type="string" name="mediasize_na_index_3x5" /> + <java-symbol type="string" name="mediasize_na_index_4x6" /> + <java-symbol type="string" name="mediasize_na_index_5x8" /> + <java-symbol type="string" name="mediasize_na_monarch" /> + <java-symbol type="string" name="mediasize_na_quarto" /> + <java-symbol type="string" name="mediasize_na_foolscap" /> + <java-symbol type="string" name="mediasize_chinese_roc_8k" /> + <java-symbol type="string" name="mediasize_chinese_roc_16k" /> + <java-symbol type="string" name="mediasize_chinese_prc_1" /> + <java-symbol type="string" name="mediasize_chinese_prc_2" /> + <java-symbol type="string" name="mediasize_chinese_prc_3" /> + <java-symbol type="string" name="mediasize_chinese_prc_4" /> + <java-symbol type="string" name="mediasize_chinese_prc_5" /> + <java-symbol type="string" name="mediasize_chinese_prc_6" /> + <java-symbol type="string" name="mediasize_chinese_prc_7" /> + <java-symbol type="string" name="mediasize_chinese_prc_8" /> + <java-symbol type="string" name="mediasize_chinese_prc_9" /> + <java-symbol type="string" name="mediasize_chinese_prc_10" /> + <java-symbol type="string" name="mediasize_chinese_prc_16k" /> + <java-symbol type="string" name="mediasize_chinese_om_pa_kai" /> + <java-symbol type="string" name="mediasize_chinese_om_dai_pa_kai" /> + <java-symbol type="string" name="mediasize_chinese_om_jurro_ku_kai" /> + <java-symbol type="string" name="mediasize_japanese_jis_b10" /> + <java-symbol type="string" name="mediasize_japanese_jis_b9" /> + <java-symbol type="string" name="mediasize_japanese_jis_b8" /> + <java-symbol type="string" name="mediasize_japanese_jis_b7" /> + <java-symbol type="string" name="mediasize_japanese_jis_b6" /> + <java-symbol type="string" name="mediasize_japanese_jis_b5" /> + <java-symbol type="string" name="mediasize_japanese_jis_b4" /> + <java-symbol type="string" name="mediasize_japanese_jis_b3" /> + <java-symbol type="string" name="mediasize_japanese_jis_b2" /> + <java-symbol type="string" name="mediasize_japanese_jis_b1" /> + <java-symbol type="string" name="mediasize_japanese_jis_b0" /> + <java-symbol type="string" name="mediasize_japanese_jis_exec" /> + <java-symbol type="string" name="mediasize_japanese_chou4" /> + <java-symbol type="string" name="mediasize_japanese_chou3" /> + <java-symbol type="string" name="mediasize_japanese_chou2" /> + <java-symbol type="string" name="mediasize_japanese_hagaki" /> + <java-symbol type="string" name="mediasize_japanese_oufuku" /> + <java-symbol type="string" name="mediasize_japanese_kahu" /> + <java-symbol type="string" name="mediasize_japanese_kaku2" /> + <java-symbol type="string" name="mediasize_japanese_you4" /> <java-symbol type="string" name="reason_unknown" /> <java-symbol type="string" name="restr_pin_enter_admin_pin" /> <java-symbol type="string" name="restr_pin_enter_pin" /> @@ -1031,6 +1035,7 @@ <java-symbol type="drawable" name="ic_emergency" /> <java-symbol type="drawable" name="ic_media_stop" /> <java-symbol type="drawable" name="ic_text_dot" /> + <java-symbol type="drawable" name="ic_print" /> <java-symbol type="drawable" name="indicator_code_lock_drag_direction_green_up" /> <java-symbol type="drawable" name="indicator_code_lock_drag_direction_red_up" /> <java-symbol type="drawable" name="indicator_code_lock_point_area_default_holo" /> diff --git a/docs/html/training/id-auth/identify.jd b/docs/html/training/id-auth/identify.jd index d4a6f7accc28..2b31bdd8c039 100644 --- a/docs/html/training/id-auth/identify.jd +++ b/docs/html/training/id-auth/identify.jd @@ -13,7 +13,7 @@ next.link=authenticate.html <div id="tb"> <h2>This lesson teaches you to</h2> <ol> - <li><a href="#ForYou">Determine if AccountManager for You</a></li> + <li><a href="#ForYou">Determine if AccountManager is for You</a></li> <li><a href="#TaskTwo">Decide What Type of Account to Use</a></li> <li><a href="#GetPermission">Request GET_ACCOUNT permission</a></li> <li><a href="#TaskFive">Query AccountManager for a List of Accounts</a></li> @@ -41,7 +41,7 @@ that the user has stored on their device.</p> </ul> -<h2 id="ForYou">Determine if AccountManager for You</h2> +<h2 id="ForYou">Determine if AccountManager is for You</h2> <p>Applications typically try to remember the user using one of three techniques:</p> <ol type="a"> diff --git a/libs/hwui/DisplayListOp.h b/libs/hwui/DisplayListOp.h index b0524615b73f..326805a5894b 100644 --- a/libs/hwui/DisplayListOp.h +++ b/libs/hwui/DisplayListOp.h @@ -772,7 +772,7 @@ public: TextureVertex* vertex = &vertices[0]; const bool hasLayer = renderer.hasLayer(); - bool transformed = false; + bool pureTranslate = true; // TODO: manually handle rect clip for bitmaps by adjusting texCoords per op, // and allowing them to be merged in getBatchId() @@ -782,7 +782,7 @@ public: // When we reach multiDraw(), the matrix can be either // pureTranslate or simple (translate and/or scale). // If the matrix is not pureTranslate, then we have a scale - if (state.mMatrix.isPureTranslate()) transformed = true; + pureTranslate &= state.mMatrix.isPureTranslate(); Rect texCoords(0, 0, 1, 1); ((DrawBitmapOp*) ops[i].op)->mUvMapper.map(texCoords); @@ -801,7 +801,7 @@ public: } return renderer.drawBitmaps(mBitmap, mEntry, ops.size(), &vertices[0], - transformed, bounds, mPaint); + pureTranslate, bounds, mPaint); } virtual void output(int level, uint32_t logFlags) const { diff --git a/libs/hwui/Matrix.cpp b/libs/hwui/Matrix.cpp index 1948778ceb7c..ba22071d620b 100644 --- a/libs/hwui/Matrix.cpp +++ b/libs/hwui/Matrix.cpp @@ -110,10 +110,6 @@ uint8_t Matrix4::getType() const { mType |= kTypeRectToRect; } } - - if (m00 > 0.0f && m11 > 0.0f) { - mType |= kTypePositiveScale; - } } return mType; } @@ -127,7 +123,7 @@ bool Matrix4::rectToRect() const { } bool Matrix4::positiveScale() const { - return getType() & kTypePositiveScale; + return (data[kScaleX] > 0.0f && data[kScaleY] > 0.0f); } bool Matrix4::changesBounds() const { diff --git a/libs/hwui/Matrix.h b/libs/hwui/Matrix.h index e2c5b2088e7a..b861ba4abb25 100644 --- a/libs/hwui/Matrix.h +++ b/libs/hwui/Matrix.h @@ -64,8 +64,7 @@ public: kTypeAffine = 0x4, kTypePerspective = 0x8, kTypeRectToRect = 0x10, - kTypePositiveScale = 0x20, - kTypeUnknown = 0x40, + kTypeUnknown = 0x20, }; static const int sGeometryMask = 0xf; diff --git a/libs/hwui/OpenGLRenderer.cpp b/libs/hwui/OpenGLRenderer.cpp index 89a82fdc4a84..35fc804594b5 100644 --- a/libs/hwui/OpenGLRenderer.cpp +++ b/libs/hwui/OpenGLRenderer.cpp @@ -2096,7 +2096,7 @@ void OpenGLRenderer::drawAlphaBitmap(Texture* texture, float left, float top, Sk * The caller is responsible for properly dirtying the current layer. */ status_t OpenGLRenderer::drawBitmaps(SkBitmap* bitmap, AssetAtlas::Entry* entry, int bitmapCount, - TextureVertex* vertices, bool transformed, const Rect& bounds, SkPaint* paint) { + TextureVertex* vertices, bool pureTranslate, const Rect& bounds, SkPaint* paint) { mCaches.activeTexture(0); Texture* texture = entry ? entry->texture : mCaches.textureCache.get(bitmap); if (!texture) return DrawGlInfo::kStatusDone; @@ -2108,7 +2108,7 @@ status_t OpenGLRenderer::drawBitmaps(SkBitmap* bitmap, AssetAtlas::Entry* entry, getAlphaAndMode(paint, &alpha, &mode); texture->setWrap(GL_CLAMP_TO_EDGE, true); - texture->setFilter(transformed ? FILTER(paint) : GL_NEAREST, true); + texture->setFilter(pureTranslate ? GL_NEAREST : FILTER(paint), true); const float x = (int) floorf(bounds.left + 0.5f); const float y = (int) floorf(bounds.top + 0.5f); diff --git a/libs/hwui/OpenGLRenderer.h b/libs/hwui/OpenGLRenderer.h index f74df9736d40..9afb7ad4f2d2 100644 --- a/libs/hwui/OpenGLRenderer.h +++ b/libs/hwui/OpenGLRenderer.h @@ -285,7 +285,7 @@ public: virtual status_t drawLayer(Layer* layer, float x, float y); virtual status_t drawBitmap(SkBitmap* bitmap, float left, float top, SkPaint* paint); status_t drawBitmaps(SkBitmap* bitmap, AssetAtlas::Entry* entry, int bitmapCount, - TextureVertex* vertices, bool transformed, const Rect& bounds, SkPaint* paint); + TextureVertex* vertices, bool pureTranslate, const Rect& bounds, SkPaint* paint); virtual status_t drawBitmap(SkBitmap* bitmap, SkMatrix* matrix, SkPaint* paint); virtual status_t drawBitmap(SkBitmap* bitmap, float srcLeft, float srcTop, float srcRight, float srcBottom, float dstLeft, float dstTop, diff --git a/packages/PrintSpooler/src/com/android/printspooler/NotificationController.java b/packages/PrintSpooler/src/com/android/printspooler/NotificationController.java index 829fb0681494..25bb071ac4cb 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/NotificationController.java +++ b/packages/PrintSpooler/src/com/android/printspooler/NotificationController.java @@ -89,7 +89,7 @@ public class NotificationController { private void createPrintingNotification(PrintJobInfo printJob) { Notification.Builder builder = new Notification.Builder(mContext) - .setSmallIcon(R.drawable.stat_notify_print) + .setSmallIcon(com.android.internal.R.drawable.ic_print) .setContentTitle(mContext.getString(R.string.printing_notification_title_template, printJob.getLabel())) .addAction(R.drawable.stat_notify_cancelling, mContext.getString(R.string.cancel), diff --git a/services/java/com/android/server/am/ActivityManagerService.java b/services/java/com/android/server/am/ActivityManagerService.java index 7a480dcf836d..47297c0583b8 100644 --- a/services/java/com/android/server/am/ActivityManagerService.java +++ b/services/java/com/android/server/am/ActivityManagerService.java @@ -15062,8 +15062,7 @@ public final class ActivityManagerService extends ActivityManagerNative } mLastMemoryLevel = memFactor; mLastNumProcesses = mLruProcesses.size(); - boolean allChanged = mProcessStats.setMemFactorLocked( - ProcessStats.ADJ_MEM_FACTOR_NORMAL, !mSleeping, now); + boolean allChanged = mProcessStats.setMemFactorLocked(memFactor, !mSleeping, now); final int trackerMemFactor = mProcessStats.getMemFactorLocked(); if (memFactor != ProcessStats.ADJ_MEM_FACTOR_NORMAL) { if (mLowRamStartTime == 0) { diff --git a/services/java/com/android/server/am/ProcessList.java b/services/java/com/android/server/am/ProcessList.java index ef7f5233445e..f24e7fe293c8 100644 --- a/services/java/com/android/server/am/ProcessList.java +++ b/services/java/com/android/server/am/ProcessList.java @@ -133,7 +133,7 @@ final class ProcessList { // The number of cached at which we don't consider it necessary to do // memory trimming. - static final int TRIM_CACHED_APPS = (MAX_CACHED_APPS-MAX_EMPTY_APPS)/2; + static final int TRIM_CACHED_APPS = ((MAX_CACHED_APPS-MAX_EMPTY_APPS)*2)/3; // Threshold of number of cached+empty where we consider memory critical. static final int TRIM_CRITICAL_THRESHOLD = 3; @@ -141,14 +141,6 @@ final class ProcessList { // Threshold of number of cached+empty where we consider memory critical. static final int TRIM_LOW_THRESHOLD = 5; - // We put empty content processes after any cached processes that have - // been idle for less than 15 seconds. - static final long CONTENT_APP_IDLE_OFFSET = 15*1000; - - // We put empty content processes after any cached processes that have - // been idle for less than 120 seconds. - static final long EMPTY_APP_IDLE_OFFSET = 120*1000; - // These are the various interesting memory levels that we will give to // the OOM killer. Note that the OOM killer only supports 6 slots, so we // can't give it a different value for every possible kind of process. diff --git a/services/java/com/android/server/pm/KeySetManager.java b/services/java/com/android/server/pm/KeySetManager.java index 93992c21f328..66dc1d13c0e1 100644 --- a/services/java/com/android/server/pm/KeySetManager.java +++ b/services/java/com/android/server/pm/KeySetManager.java @@ -102,7 +102,7 @@ public class KeySetManager { public void addDefinedKeySetToPackage(String packageName, Set<PublicKey> keys, String alias) { if ((packageName == null) || (keys == null) || (alias == null)) { - Log.d(TAG, "Got null argument for a defined keyset, ignoring!"); + //Log.d(TAG, "Got null argument for a defined keyset, ignoring!"); return; } synchronized (mLockObject) { @@ -123,7 +123,7 @@ public class KeySetManager { public void addSigningKeySetToPackage(String packageName, Set<PublicKey> signingKeys) { if ((packageName == null) || (signingKeys == null)) { - Log.d(TAG, "Got null argument for a signing keyset, ignoring!"); + //Log.d(TAG, "Got null argument for a signing keyset, ignoring!"); return; } synchronized (mLockObject) { diff --git a/services/java/com/android/server/print/PrintManagerService.java b/services/java/com/android/server/print/PrintManagerService.java index ddc50466d98e..5f8708acb397 100644 --- a/services/java/com/android/server/print/PrintManagerService.java +++ b/services/java/com/android/server/print/PrintManagerService.java @@ -17,12 +17,17 @@ package com.android.server.print; import android.Manifest; +import android.app.Notification; +import android.app.NotificationManager; +import android.app.PendingIntent; import android.content.BroadcastReceiver; import android.content.ComponentName; import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.content.pm.ServiceInfo; import android.database.ContentObserver; import android.net.Uri; import android.os.Binder; @@ -40,6 +45,7 @@ import android.printservice.PrintServiceInfo; import android.provider.Settings; import android.util.SparseArray; +import com.android.internal.R; import com.android.internal.content.PackageMonitor; import com.android.internal.os.BackgroundThread; @@ -53,6 +59,9 @@ public final class PrintManagerService extends IPrintManager.Stub { private static final char COMPONENT_NAME_SEPARATOR = ':'; + private static final String EXTRA_PRINT_SERVICE_COMPONENT_NAME = + "EXTRA_PRINT_SERVICE_COMPONENT_NAME"; + private final Object mLock = new Object(); private final Context mContext; @@ -395,6 +404,25 @@ public final class PrintManagerService extends IPrintManager.Stub { } } + @Override + public void onPackageAdded(String packageName, int uid) { + Intent intent = new Intent(android.printservice.PrintService.SERVICE_INTERFACE); + intent.setPackage(packageName); + + List<ResolveInfo> installedServices = mContext.getPackageManager() + .queryIntentServicesAsUser(intent, PackageManager.GET_SERVICES, + getChangingUserId()); + + final int installedServiceCount = installedServices.size(); + for (int i = 0; i < installedServiceCount; i++) { + ServiceInfo serviceInfo = installedServices.get(i).serviceInfo; + ComponentName component = new ComponentName(serviceInfo.packageName, + serviceInfo.name); + String label = serviceInfo.loadLabel(mContext.getPackageManager()).toString(); + showEnableInstalledPrintServiceNotification(component, label); + } + } + private void persistComponentNamesToSettingLocked(String settingName, Set<ComponentName> componentNames, int userId) { StringBuilder builder = new StringBuilder(); @@ -522,4 +550,28 @@ public final class PrintManagerService extends IPrintManager.Stub { throw new IllegalArgumentException("Calling user can be changed to only " + "UserHandle.USER_CURRENT or UserHandle.USER_CURRENT_OR_SELF."); } + + private void showEnableInstalledPrintServiceNotification(ComponentName component, + String label) { + Intent intent = new Intent(Settings.ACTION_PRINT_SETTINGS); + intent.putExtra(EXTRA_PRINT_SERVICE_COMPONENT_NAME, component.flattenToString()); + + PendingIntent pendingIntent = PendingIntent.getActivity(mContext, 0, intent, + PendingIntent.FLAG_ONE_SHOT | PendingIntent.FLAG_CANCEL_CURRENT, null); + + Notification.Builder builder = new Notification.Builder(mContext) + .setSmallIcon(R.drawable.ic_print) + .setContentTitle(mContext.getString(R.string.print_service_installed_title, label)) + .setContentText(mContext.getString(R.string.print_service_installed_message)) + .setContentIntent(pendingIntent) + .setWhen(System.currentTimeMillis()) + .setAutoCancel(true) + .setShowWhen(true); + + NotificationManager notificationManager = (NotificationManager) mContext + .getSystemService(Context.NOTIFICATION_SERVICE); + + String notificationTag = getClass().getName() + ":" + component.flattenToString(); + notificationManager.notify(notificationTag, 0, builder.build()); + } } |
