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

Commit 5772b5c6 authored by Svet Ganov's avatar Svet Ganov
Browse files

Propagete document meta-data to custom print UI. 

Change-Id: I3f122224e1b311a222969253ae0336177989a414
parent e545bd36

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -24477,6 +24477,7 @@ package android.printservice { 
    method protected abstract void onPrintJobQueued(android.printservice.PrintJob);

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

    field public static final java.lang.String EXTRA_PRINTER_INFO = "android.intent.extra.print.EXTRA_PRINTER_INFO";

    field public static final java.lang.String EXTRA_PRINT_DOCUMENT_INFO = "android.printservice.extra.PRINT_DOCUMENT_INFO";

    field public static final java.lang.String EXTRA_PRINT_JOB_INFO = "android.intent.extra.print.PRINT_JOB_INFO";

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

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

api/system-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -26415,6 +26415,7 @@ package android.printservice { 
    method protected abstract void onPrintJobQueued(android.printservice.PrintJob);

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

    field public static final java.lang.String EXTRA_PRINTER_INFO = "android.intent.extra.print.EXTRA_PRINTER_INFO";

    field public static final java.lang.String EXTRA_PRINT_DOCUMENT_INFO = "android.printservice.extra.PRINT_DOCUMENT_INFO";

    field public static final java.lang.String EXTRA_PRINT_JOB_INFO = "android.intent.extra.print.PRINT_JOB_INFO";

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

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

core/java/android/printservice/PrintService.java

+13 −0
Original line number Diff line number Diff line
@@ -231,6 +231,19 @@ public abstract class PrintService extends Service { 
     */

    public static final String EXTRA_PRINTER_INFO = "android.intent.extra.print.EXTRA_PRINTER_INFO";



    /**

     * If you declared an optional activity with advanced print options via the

     * {@link android.R.attr#advancedPrintOptionsActivity advancedPrintOptionsActivity}

     * attribute, this extra is used to pass in the meta-data for the currently printed

     * document as a {@link android.print.PrintDocumentInfo} to your activity allowing

     * you to inspect it.

     *

     * @see #EXTRA_PRINT_JOB_INFO

     * @see #EXTRA_PRINTER_INFO

     */

    public static final String EXTRA_PRINT_DOCUMENT_INFO =

            "android.printservice.extra.PRINT_DOCUMENT_INFO";



    private Handler mHandler;



    private IPrintServiceClient mClient;

packages/PrintSpooler/src/com/android/printspooler/ui/PrintActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -679,6 +679,8 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
        if (resolvedActivities.get(0).activityInfo.exported) {

            intent.putExtra(PrintService.EXTRA_PRINT_JOB_INFO, mPrintJob);

            intent.putExtra(PrintService.EXTRA_PRINTER_INFO, printer);

            intent.putExtra(PrintService.EXTRA_PRINT_JOB_INFO,

                    mPrintedDocument.getDocumentInfo().info);



            // This is external activity and may not be there.

            try {