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

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

Merge "Print APIs documentation update"

parents 07f36c73 fd90651c

Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -160,7 +160,7 @@ LOCAL_SRC_FILES += \ 
	core/java/android/print/IPrinterDiscoveryObserver.aidl \

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

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

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

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

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

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

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

api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -18404,12 +18404,12 @@ package android.print { 
    ctor public PrintAdapter();

    method public abstract android.print.PrintAdapterInfo getInfo();

    method public void onFinish();

    method public abstract void onPrint(java.util.List<android.print.PageRange>, java.io.FileDescriptor, android.os.CancellationSignal, android.print.PrintAdapter.PrintProgressCallback);

    method public abstract void onPrint(java.util.List<android.print.PageRange>, java.io.FileDescriptor, android.os.CancellationSignal, android.print.PrintAdapter.PrintResultCallback);

    method public boolean onPrintAttributesChanged(android.print.PrintAttributes);

    method public void onStart();

  }













  public static abstract class PrintAdapter.PrintProgressCallback {













  public static abstract class PrintAdapter.PrintResultCallback {















    method public void onPrintFailed(java.lang.CharSequence);















    method public void onPrintFinished(java.util.List<android.print.PageRange>);















  }

























core/java/android/print/IPrintAdapter.aidl



+2
−2




























Original line number
Diff line number
Diff line








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













package android.print;































import android.os.ParcelFileDescriptor;













import android.print.IPrintProgressListener;













import android.print.IPrintResultCallback;















import android.print.PageRange;















import android.print.PrintAttributes;

























@@ -30,6 +30,6 @@ oneway interface IPrintAdapter {













    void start();















    void printAttributesChanged(in PrintAttributes attributes);















    void print(in List<PageRange> pages, in ParcelFileDescriptor fd,













            IPrintProgressListener progressListener);













            IPrintResultCallback callback);















    void finish();















}
























core/java/android/print/IPrintProgressListener.aidl→core/java/android/print/IPrintResultCallback.aidl



+4
−4




























Original line number
Diff line number
Diff line








@@ -26,8 +26,8 @@ import android.print.PrintAdapterInfo;













 *















 * @hide















 */













oneway interface IPrintProgressListener {













    void onWriteStarted(in PrintAdapterInfo info, ICancellationSignal cancellationSignal);













    void onWriteFinished(in List<PageRange> pages);













    void onWriteFailed(CharSequence error);













oneway interface IPrintResultCallback {













    void onPrintStarted(in PrintAdapterInfo info, ICancellationSignal cancellationSignal);













    void onPrintFinished(in List<PageRange> pages);













    void onPrintFailed(CharSequence error);















}
























core/java/android/print/PageRange.java



+1
−1




























Original line number
Diff line number
Diff line








@@ -21,7 +21,7 @@ import android.os.Parcelable;





























/**















 * Represents a range of pages. The start and end page indices of













 * the range are zero based and are inclusive.













 * the range are zero based and inclusive.















 */















public final class PageRange implements Parcelable {