Merge "Iteration on the print sub-system." (9f1ef002) · Commits · e / os / android_frameworks_base

api/current.txt

+5 −4

Original line number	Diff line number	Diff line
		@@ -18542,7 +18542,6 @@ package android.print {
		method public void clear();
		method public int describeContents();
		method public int getColorMode();
		method public int getCopies();
		method public int getDuplexMode();
		method public int getFittingMode();
		method public android.print.PrintAttributes.Tray getInputTray();
		@@ -18568,7 +18567,6 @@ package android.print {
		ctor public PrintAttributes.Builder();
		method public android.print.PrintAttributes create();
		method public android.print.PrintAttributes.Builder setColorMode(int);
		method public android.print.PrintAttributes.Builder setCopyCount(int);
		method public android.print.PrintAttributes.Builder setDuplexMode(int);
		method public android.print.PrintAttributes.Builder setFittingMode(int);
		method public android.print.PrintAttributes.Builder setInputTray(android.print.PrintAttributes.Tray);
		@@ -18654,18 +18652,20 @@ package android.print {
		method public void onFinish();
		method public abstract void onLayout(android.print.PrintAttributes, android.print.PrintAttributes, android.os.CancellationSignal, android.print.PrintDocumentAdapter.LayoutResultCallback, android.os.Bundle);
		method public void onStart();
		method public abstract void onWrite(java.util.List<android.print.PageRange>, java.io.FileDescriptor, android.os.CancellationSignal, android.print.PrintDocumentAdapter.WriteResultCallback);
		method public abstract void onWrite(android.print.PageRange[], java.io.FileDescriptor, android.os.CancellationSignal, android.print.PrintDocumentAdapter.WriteResultCallback);
		field public static final java.lang.String METADATA_KEY_PRINT_PREVIEW = "KEY_METADATA_PRINT_PREVIEW";
		}

		public static abstract class PrintDocumentAdapter.LayoutResultCallback {
		method public void onLayoutCancelled();
		method public void onLayoutFailed(java.lang.CharSequence);
		method public void onLayoutFinished(android.print.PrintDocumentInfo, boolean);
		}

		public static abstract class PrintDocumentAdapter.WriteResultCallback {
		method public void onWriteCancelled();
		method public void onWriteFailed(java.lang.CharSequence);
		method public void onWriteFinished(java.util.List<android.print.PageRange>);
		method public void onWriteFinished(android.print.PageRange[]);
		}

		public final class PrintDocumentInfo implements android.os.Parcelable {
		@@ -18696,6 +18696,7 @@ package android.print {
		public final class PrintJobInfo implements android.os.Parcelable {
		method public int describeContents();
		method public android.print.PrintAttributes getAttributes();
		method public int getCopies();
		method public int getId();
		method public java.lang.CharSequence getLabel();
		method public android.print.PageRange[] getPages();

core/java/android/print/FileDocumentAdapter.java

+2 −6

Original line number	Diff line number	Diff line
		@@ -34,8 +34,6 @@ import java.io.FileOutputStream;
		import java.io.IOException;
		import java.io.InputStream;
		import java.io.OutputStream;
		import java.util.ArrayList;
		import java.util.List;

		/**
		* Adapter for printing files.
		@@ -69,7 +67,7 @@ final class FileDocumentAdapter extends PrintDocumentAdapter {
		}

		@Override
		public void onWrite(List<PageRange> pages, FileDescriptor destination,
		public void onWrite(PageRange[] pages, FileDescriptor destination,
		CancellationSignal cancellationSignal, WriteResultCallback callback) {
		mWriteFileAsyncTask = new WriteFileAsyncTask(destination, cancellationSignal, callback);
		mWriteFileAsyncTask.executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR,
		@@ -127,9 +125,7 @@ final class FileDocumentAdapter extends PrintDocumentAdapter {

		@Override
		protected void onPostExecute(Void result) {
		List<PageRange> pages = new ArrayList<PageRange>();
		pages.add(PageRange.ALL_PAGES);
		mResultCallback.onWriteFinished(pages);
		mResultCallback.onWriteFinished(new PageRange[] {PageRange.ALL_PAGES});
		}

		@Override

core/java/android/print/ILayoutResultCallback.aidl

+2 −4

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

		package android.print;

		import android.os.ICancellationSignal;
		import android.print.PrintDocumentInfo;

		/**
		@@ -25,7 +24,6 @@ import android.print.PrintDocumentInfo;
		* @hide
		*/
		oneway interface ILayoutResultCallback {
		void onLayoutStarted(ICancellationSignal cancellationSignal);
		void onLayoutFinished(in PrintDocumentInfo info, boolean changed);
		void onLayoutFailed(CharSequence error);
		void onLayoutFinished(in PrintDocumentInfo info, boolean changed, int sequence);
		void onLayoutFailed(CharSequence error, int sequence);
		}

core/java/android/print/IPrintDocumentAdapter.aidl

+3 −3

Original line number	Diff line number	Diff line
		@@ -31,8 +31,8 @@ import android.print.PrintAttributes;
		oneway interface IPrintDocumentAdapter {
		void start();
		void layout(in PrintAttributes oldAttributes, in PrintAttributes newAttributes,
		ILayoutResultCallback callback, in Bundle metadata);
		void write(in List<PageRange> pages, in ParcelFileDescriptor fd,
		IWriteResultCallback callback);
		ILayoutResultCallback callback, in Bundle metadata, int sequence);
		void write(in PageRange[] pages, in ParcelFileDescriptor fd,
		IWriteResultCallback callback, int sequence);
		void finish();
		}

core/java/android/print/IPrintManager.aidl

+0 −1

Original line number	Diff line number	Diff line
		@@ -33,5 +33,4 @@ interface IPrintManager {
		in IPrintDocumentAdapter printAdapter, in PrintAttributes attributes,
		int appId, int userId);
		void cancelPrintJob(int printJobId, int appId, int userId);

		}