Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c7c4d6dd authored by Svetoslav Ganov's avatar Svetoslav Ganov Committed by Android (Google) Code Review
Browse files

Merge "Refinement of the print service APIs." into klp-dev

parents 0dd303cf 798bed6c

Android.mk

+2 −1
Original line number Diff line number Diff line
@@ -162,8 +162,9 @@ LOCAL_SRC_FILES += \ 
	core/java/android/os/IVibratorService.aidl \

	core/java/android/service/notification/INotificationListener.aidl \

	core/java/android/print/ILayoutResultCallback.aidl \

	core/java/android/print/IPrinterDiscoverySessionController.aidl \

	core/java/android/print/IPrinterDiscoverySessionObserver.aidl \

	core/java/android/print/IPrintDocumentAdapter.aidl \

	core/java/android/print/IPrinterDiscoveryObserver.aidl \

	core/java/android/print/IPrintClient.aidl \

	core/java/android/print/IPrintManager.aidl \

	core/java/android/print/IPrintSpooler.aidl \

CleanSpec.mk

+1 −0
Original line number Diff line number Diff line
@@ -167,6 +167,7 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framew 
$(call add-clean-step, rm -rf $(HOST_OUT)/obj/STATIC_LIBRARIES/libandroidfw_intermediates/import_includes)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates)

$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/framework-base_intermediates/src/core/java/android/print/IPrinterDiscoveryObserver.*)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************

api/current.txt

+70 −37
Original line number Diff line number Diff line
@@ -18629,11 +18629,11 @@ package android.print { 
  }















  public static final class PrintAttributes.MediaSize {













    ctor public PrintAttributes.MediaSize(java.lang.String, java.lang.CharSequence, int, int);













    ctor public PrintAttributes.MediaSize(java.lang.String, java.lang.String, int, int);















    method public static android.print.PrintAttributes.MediaSize createMediaSize(android.content.pm.PackageManager, int);















    method public int getHeightMils();















    method public java.lang.String getId();













    method public java.lang.CharSequence getLabel();













    method public java.lang.String getLabel();















    method public int getWidthMils();















    field public static final int ISO_A0 = 1; // 0x1















    field public static final int ISO_A1 = 2; // 0x2










@@ -18677,17 +18677,17 @@ package android.print {













  }





























  public static final class PrintAttributes.Resolution {













    ctor public PrintAttributes.Resolution(java.lang.String, java.lang.CharSequence, int, int);













    ctor public PrintAttributes.Resolution(java.lang.String, java.lang.String, int, int);















    method public int getHorizontalDpi();















    method public java.lang.String getId();













    method public java.lang.CharSequence getLabel();













    method public java.lang.String getLabel();















    method public int getVerticalDpi();















  }





























  public static final class PrintAttributes.Tray {













    ctor public PrintAttributes.Tray(java.lang.String, java.lang.CharSequence);













    ctor public PrintAttributes.Tray(java.lang.String, java.lang.String);















    method public java.lang.String getId();













    method public java.lang.CharSequence getLabel();













    method public java.lang.String getLabel();















  }





























  public abstract class PrintDocumentAdapter {









@@ -18714,6 +18714,7 @@ package android.print {













  public final class PrintDocumentInfo implements android.os.Parcelable {















    method public int describeContents();















    method public int getContentType();













    method public java.lang.String getName();















    method public int getPageCount();















    method public void writeToParcel(android.os.Parcel, int);















    field public static final int CONTENT_TYPE_DOCUMENT = 0; // 0x0









@@ -18724,12 +18725,18 @@ package android.print {













  }





























  public static final class PrintDocumentInfo.Builder {













    ctor public PrintDocumentInfo.Builder();













    ctor public PrintDocumentInfo.Builder(java.lang.String);















    method public android.print.PrintDocumentInfo create();















    method public android.print.PrintDocumentInfo.Builder setContentType(int);















    method public android.print.PrintDocumentInfo.Builder setPageCount(int);















  }



























  public final class PrintFileDocumentAdapter extends android.print.PrintDocumentAdapter {













    ctor public PrintFileDocumentAdapter(android.content.Context, java.io.File, android.print.PrintDocumentInfo);













    method public void onLayout(android.print.PrintAttributes, android.print.PrintAttributes, android.os.CancellationSignal, android.print.PrintDocumentAdapter.LayoutResultCallback, android.os.Bundle);













    method public void onWrite(android.print.PageRange[], java.io.FileDescriptor, android.os.CancellationSignal, android.print.PrintDocumentAdapter.WriteResultCallback);













  }



























  public final class PrintJob {















    method public void cancel();















    method public int getId();










@@ -18758,50 +18765,66 @@ package android.print {



























  public final class PrintManager {















    method public java.util.List<android.print.PrintJob> getPrintJobs();













    method public android.print.PrintJob print(java.lang.String, java.io.File, android.print.PrintAttributes);













    method public android.print.PrintJob print(java.lang.String, java.io.File, android.print.PrintDocumentInfo, android.print.PrintAttributes);















    method public android.print.PrintJob print(java.lang.String, android.print.PrintDocumentAdapter, android.print.PrintAttributes);















  }



























  public final class PrinterId implements android.os.Parcelable {













    method public int describeContents();













    method public java.lang.String getPrinterName();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator CREATOR;













  }

























  public final class PrinterInfo implements android.os.Parcelable {













  public final class PrinterCapabilitiesInfo implements android.os.Parcelable {















    method public int describeContents();















    method public int getColorModes();















    method public void getDefaults(android.print.PrintAttributes);















    method public int getDuplexModes();















    method public int getFittingModes();













    method public android.print.PrinterId getId();















    method public java.util.List<android.print.PrintAttributes.Tray> getInputTrays();















    method public java.util.List<android.print.PrintAttributes.MediaSize> getMediaSizes();















    method public android.print.PrintAttributes.Margins getMinMargins();















    method public int getOrientations();















    method public java.util.List<android.print.PrintAttributes.Tray> getOutputTrays();















    method public java.util.List<android.print.PrintAttributes.Resolution> getResolutions();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator CREATOR;













  }

























  public static final class PrinterCapabilitiesInfo.Builder {













    ctor public PrinterCapabilitiesInfo.Builder(android.print.PrinterId);













    method public android.print.PrinterCapabilitiesInfo.Builder addInputTray(android.print.PrintAttributes.Tray, boolean);













    method public android.print.PrinterCapabilitiesInfo.Builder addMediaSize(android.print.PrintAttributes.MediaSize, boolean);













    method public android.print.PrinterCapabilitiesInfo.Builder addOutputTray(android.print.PrintAttributes.Tray, boolean);













    method public android.print.PrinterCapabilitiesInfo.Builder addResolution(android.print.PrintAttributes.Resolution, boolean);













    method public android.print.PrinterCapabilitiesInfo create();













    method public android.print.PrinterCapabilitiesInfo.Builder setColorModes(int, int);













    method public android.print.PrinterCapabilitiesInfo.Builder setDuplexModes(int, int);













    method public android.print.PrinterCapabilitiesInfo.Builder setFittingModes(int, int);













    method public android.print.PrinterCapabilitiesInfo.Builder setMinMargins(android.print.PrintAttributes.Margins, android.print.PrintAttributes.Margins);













    method public android.print.PrinterCapabilitiesInfo.Builder setOrientations(int, int);













  }

























  public final class PrinterId implements android.os.Parcelable {













    method public int describeContents();













    method public java.lang.String getLocalId();













    method public void writeToParcel(android.os.Parcel, int);













    field public static final android.os.Parcelable.Creator CREATOR;













  }

























  public final class PrinterInfo implements android.os.Parcelable {













    method public int describeContents();













    method public android.print.PrinterCapabilitiesInfo getCapabilities();













    method public java.lang.String getDescription();













    method public android.print.PrinterId getId();













    method public java.lang.String getName();















    method public int getStatus();













    method public boolean hasAllRequiredAttributes();















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator CREATOR;















    field public static final int STATUS_READY = 1; // 0x1















  }





























  public static final class PrinterInfo.Builder {













    ctor public PrinterInfo.Builder(android.print.PrinterId);













    method public android.print.PrinterInfo.Builder addInputTray(android.print.PrintAttributes.Tray, boolean);













    method public android.print.PrinterInfo.Builder addMediaSize(android.print.PrintAttributes.MediaSize, boolean);













    method public android.print.PrinterInfo.Builder addOutputTray(android.print.PrintAttributes.Tray, boolean);













    method public android.print.PrinterInfo.Builder addResolution(android.print.PrintAttributes.Resolution, boolean);













    ctor public PrinterInfo.Builder(android.print.PrinterId, java.lang.String, int);













    ctor public PrinterInfo.Builder(android.print.PrinterInfo);















    method public android.print.PrinterInfo create();













    method public android.print.PrinterInfo.Builder setColorModes(int, int);













    method public android.print.PrinterInfo.Builder setDuplexModes(int, int);













    method public android.print.PrinterInfo.Builder setFittingModes(int, int);













    method public android.print.PrinterInfo.Builder setMinMargins(android.print.PrintAttributes.Margins, android.print.PrintAttributes.Margins);













    method public android.print.PrinterInfo.Builder setOrientations(int, int);













    method public android.print.PrinterInfo.Builder setStatus(int);













    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 setName(java.lang.String);















  }





























}










@@ -18853,6 +18876,9 @@ package android.printservice {













    method public android.printservice.PrintDocument getDocument();















    method public int getId();















    method public android.print.PrintJobInfo getInfo();













    method public boolean isCancelled();













    method public boolean isCompleted();













    method public boolean isFailed();















    method public boolean isQueued();















    method public boolean isStarted();















    method public boolean setTag(java.lang.String);









@@ -18861,23 +18887,30 @@ package android.printservice {



























  public abstract class PrintService extends android.app.Service {















    ctor public PrintService();













    method public final void addDiscoveredPrinters(java.util.List<android.print.PrinterInfo>);













    method protected final void attachBaseContext(android.content.Context);















    method public final android.print.PrinterId generatePrinterId(java.lang.String);













    method public final java.util.List<android.printservice.PrintJob> getPrintJobs();













    method public final java.util.List<android.printservice.PrintJob> getActivePrintJobs();















    method public final android.os.IBinder onBind(android.content.Intent);















    method protected void onConnected();













    method protected abstract android.printservice.PrinterDiscoverySession onCreatePrinterDiscoverySession();















    method protected void onDisconnected();















    method protected abstract void onPrintJobQueued(android.printservice.PrintJob);













    method protected void onRequestCancelPrintJob(android.printservice.PrintJob);













    method protected void onRequestUpdatePrinters(java.util.List<android.print.PrinterId>);













    method protected abstract void onStartPrinterDiscovery();













    method protected abstract void onStopPrinterDiscovery();













    method public final void removeDiscoveredPrinters(java.util.List<android.print.PrinterId>);













    method public final void updateDiscoveredPrinters(java.util.List<android.print.PrinterInfo>);













    method protected abstract void onRequestCancelPrintJob(android.printservice.PrintJob);















    field public static final java.lang.String SERVICE_INTERFACE = "android.printservice.PrintService";















    field public static final java.lang.String SERVICE_META_DATA = "android.printservice";















  }



























  public abstract class PrinterDiscoverySession {













    ctor public PrinterDiscoverySession(android.content.Context);













    method public final void addPrinters(java.util.List<android.print.PrinterInfo>);













    method public final boolean isClosed();













    method public abstract void onClose();













    method public abstract void onOpen(java.util.List<android.print.PrinterId>);













    method public abstract void onRequestPrinterUpdate(android.print.PrinterId);













    method public final void removePrinters(java.util.List<android.print.PrinterId>);













    method public final void updatePrinters(java.util.List<android.print.PrinterInfo>);













  }



























}





























package android.provider {

























core/java/android/print/IPrintSpoolerClient.aidl



+2
−4




























Original line number
Diff line number
Diff line








@@ -17,7 +17,7 @@













package android.print;































import android.content.ComponentName;













import android.print.IPrinterDiscoveryObserver;













import android.print.IPrinterDiscoverySessionObserver;















import android.print.PrinterId;















import android.print.PrintJobInfo;

























@@ -28,10 +28,8 @@ import android.print.PrintJobInfo;













 * @hide















 */















oneway interface IPrintSpoolerClient {













    void createPrinterDiscoverySession(IPrinterDiscoverySessionObserver observer);















    void onPrintJobQueued(in PrintJobInfo printJob);













    void onStartPrinterDiscovery(IPrinterDiscoveryObserver observer);













    void onStopPrinterDiscovery();













    void onRequestUpdatePrinters(in List<PrinterId> printerIds);















    void onAllPrintJobsForServiceHandled(in ComponentName printService);















    void onAllPrintJobsHandled();















}
























core/java/android/print/IPrinterDiscoveryObserver.aidl→core/java/android/print/IPrinterDiscoverySessionController.aidl



+5
−6




























Original line number
Diff line number
Diff line








@@ -17,15 +17,14 @@













package android.print;































import android.print.PrinterId;













import android.print.PrinterInfo;































/**













 * Interface for observing printer discovery.













* Interface for the controlling part of a printer discovery session.















 *















 * @hide















 */













oneway interface IPrinterDiscoveryObserver {













    void onPrintersAdded(in List<PrinterInfo> printers);













    void onPrintersRemoved(in List<PrinterId> printers);













    void onPrintersUpdated(in List<PrinterInfo> printers);













oneway interface IPrinterDiscoverySessionController {













    void open(in List<PrinterId> priorityList);













    void requestPrinterUpdate(in PrinterId printerId);













    void close();















}