Merge "Allow a print service to specify per printer icons, description and info-activities" (4f71bcec) · Commits · e / os / android_frameworks_base

Android.mk

+1 −0

Original line number	Diff line number	Diff line
		@@ -499,6 +499,7 @@ aidl_files := \
		frameworks/base/graphics/java/android/graphics/PointF.aidl \
		frameworks/base/graphics/java/android/graphics/RectF.aidl \
		frameworks/base/graphics/java/android/graphics/Rect.aidl \
		frameworks/base/graphics/java/android/graphics/drawable/Icon.aidl \
		frameworks/base/core/java/android/accounts/AuthenticatorDescription.aidl \
		frameworks/base/core/java/android/accounts/Account.aidl \
		frameworks/base/core/java/android/app/admin/SystemUpdatePolicy.aidl \

api/current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -29146,6 +29146,9 @@ package android.print {
		method public android.print.PrinterInfo build();
		method public android.print.PrinterInfo.Builder setCapabilities(android.print.PrinterCapabilitiesInfo);
		method public android.print.PrinterInfo.Builder setDescription(java.lang.String);
		method public android.print.PrinterInfo.Builder setHasCustomPrinterIcon();
		method public android.print.PrinterInfo.Builder setIconResourceId(int);
		method public android.print.PrinterInfo.Builder setInfoIntent(android.app.PendingIntent);
		method public android.print.PrinterInfo.Builder setName(java.lang.String);
		method public android.print.PrinterInfo.Builder setStatus(int);
		}
		@@ -29166,6 +29169,10 @@ package android.print.pdf {

		package android.printservice {

		public class CustomPrinterIconCallback {
		method public boolean onCustomPrinterIconLoaded(android.graphics.drawable.Icon);
		}

		public final class PrintDocument {
		method public android.os.ParcelFileDescriptor getData();
		method public android.print.PrintDocumentInfo getInfo();
		@@ -29221,6 +29228,7 @@ package android.printservice {
		method public final boolean isDestroyed();
		method public final boolean isPrinterDiscoveryStarted();
		method public abstract void onDestroy();
		method public void onRequestCustomPrinterIcon(android.print.PrinterId, android.printservice.CustomPrinterIconCallback);
		method public abstract void onStartPrinterDiscovery(java.util.List<android.print.PrinterId>);
		method public abstract void onStartPrinterStateTracking(android.print.PrinterId);
		method public abstract void onStopPrinterDiscovery();

api/system-current.txt

+8 −0

Original line number	Diff line number	Diff line
		@@ -31156,6 +31156,9 @@ package android.print {
		method public android.print.PrinterInfo build();
		method public android.print.PrinterInfo.Builder setCapabilities(android.print.PrinterCapabilitiesInfo);
		method public android.print.PrinterInfo.Builder setDescription(java.lang.String);
		method public android.print.PrinterInfo.Builder setHasCustomPrinterIcon();
		method public android.print.PrinterInfo.Builder setIconResourceId(int);
		method public android.print.PrinterInfo.Builder setInfoIntent(android.app.PendingIntent);
		method public android.print.PrinterInfo.Builder setName(java.lang.String);
		method public android.print.PrinterInfo.Builder setStatus(int);
		}
		@@ -31176,6 +31179,10 @@ package android.print.pdf {

		package android.printservice {

		public class CustomPrinterIconCallback {
		method public boolean onCustomPrinterIconLoaded(android.graphics.drawable.Icon);
		}

		public final class PrintDocument {
		method public android.os.ParcelFileDescriptor getData();
		method public android.print.PrintDocumentInfo getInfo();
		@@ -31231,6 +31238,7 @@ package android.printservice {
		method public final boolean isDestroyed();
		method public final boolean isPrinterDiscoveryStarted();
		method public abstract void onDestroy();
		method public void onRequestCustomPrinterIcon(android.print.PrinterId, android.printservice.CustomPrinterIconCallback);
		method public abstract void onStartPrinterDiscovery(java.util.List<android.print.PrinterId>);
		method public abstract void onStartPrinterStateTracking(android.print.PrinterId);
		method public abstract void onStopPrinterDiscovery();

api/test-current.txt

+9 −0

Original line number	Diff line number	Diff line
		@@ -29135,6 +29135,7 @@ package android.print {
		method public android.print.PrinterId getId();
		method public java.lang.String getName();
		method public int getStatus();
		method public android.graphics.drawable.Drawable loadIcon(android.content.Context);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.print.PrinterInfo> CREATOR;
		field public static final int STATUS_BUSY = 2; // 0x2
		@@ -29148,6 +29149,9 @@ package android.print {
		method public android.print.PrinterInfo build();
		method public android.print.PrinterInfo.Builder setCapabilities(android.print.PrinterCapabilitiesInfo);
		method public android.print.PrinterInfo.Builder setDescription(java.lang.String);
		method public android.print.PrinterInfo.Builder setHasCustomPrinterIcon();
		method public android.print.PrinterInfo.Builder setIconResourceId(int);
		method public android.print.PrinterInfo.Builder setInfoIntent(android.app.PendingIntent);
		method public android.print.PrinterInfo.Builder setName(java.lang.String);
		method public android.print.PrinterInfo.Builder setStatus(int);
		}
		@@ -29168,6 +29172,10 @@ package android.print.pdf {

		package android.printservice {

		public class CustomPrinterIconCallback {
		method public boolean onCustomPrinterIconLoaded(android.graphics.drawable.Icon);
		}

		public final class PrintDocument {
		method public android.os.ParcelFileDescriptor getData();
		method public android.print.PrintDocumentInfo getInfo();
		@@ -29223,6 +29231,7 @@ package android.printservice {
		method public final boolean isDestroyed();
		method public final boolean isPrinterDiscoveryStarted();
		method public abstract void onDestroy();
		method public void onRequestCustomPrinterIcon(android.print.PrinterId, android.printservice.CustomPrinterIconCallback);
		method public abstract void onStartPrinterDiscovery(java.util.List<android.print.PrinterId>);
		method public abstract void onStartPrinterStateTracking(android.print.PrinterId);
		method public abstract void onStopPrinterDiscovery();

core/java/android/print/IPrintManager.aidl

+14 −0

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		package android.print;

		import android.graphics.drawable.Icon;
		import android.os.Bundle;
		import android.print.IPrinterDiscoveryObserver;
		import android.print.IPrintDocumentAdapter;
		@@ -53,6 +54,19 @@ interface IPrintManager {
		void stopPrinterDiscovery(in IPrinterDiscoveryObserver observer, int userId);
		void validatePrinters(in List<PrinterId> printerIds, int userId);
		void startPrinterStateTracking(in PrinterId printerId, int userId);

		/**
		* Get the custom icon for a printer. If the icon is not cached, the icon is
		* requested asynchronously. Once it is available the printer is updated.
		*
		* @param printerId the id of the printer the icon should be loaded for
		* @param userId the id of the user requesting the printer
		* @return the custom icon to be used for the printer or null if the icon is
		* not yet available
		* @see android.print.PrinterInfo.Builder#setHasCustomPrinterIcon()
		*/
		Icon getCustomPrinterIcon(in PrinterId printerId, int userId);

		void stopPrinterStateTracking(in PrinterId printerId, int userId);
		void destroyPrinterDiscoverySession(in IPrinterDiscoveryObserver observer,
		int userId);