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

Commit 8e5c3a00 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by android-build-merger
Browse files

Merge "Handle printers selected by SelectPrinter activity" into nyc-dev 

am: 746de4e9

* commit '746de4e9':
  Handle printers selected by SelectPrinter activity

Change-Id: Ie22f3d5d2b483a8a6354cb9968e939a80b6b1855
parents a6632820 746de4e9

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -718,6 +718,9 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
                    SelectPrinterActivity.INTENT_EXTRA_PRINTER);

                    SelectPrinterActivity.INTENT_EXTRA_PRINTER);

            if (printerInfo != null) {

            if (printerInfo != null) {

                mCurrentPrinter = printerInfo;

                mCurrentPrinter = printerInfo;

                mPrintJob.setPrinterId(printerInfo.getId());

                mPrintJob.setPrinterName(printerInfo.getName());



                mDestinationSpinnerAdapter.ensurePrinterInVisibleAdapterPosition(printerInfo);

                mDestinationSpinnerAdapter.ensurePrinterInVisibleAdapterPosition(printerInfo);

            }

            }

        }

        }
@@ -1964,7 +1967,7 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
    }

    }





    public void onPrinterAvailable(PrinterInfo printer) {

    public void onPrinterAvailable(PrinterInfo printer) {

        if (mCurrentPrinter.equals(printer)) {

        if (mCurrentPrinter != null && mCurrentPrinter.equals(printer)) {

            setState(STATE_CONFIGURING);

            setState(STATE_CONFIGURING);

            if (canUpdateDocument()) {

            if (canUpdateDocument()) {

                updateDocument(false);

                updateDocument(false);
@@ -2459,12 +2462,15 @@ public class PrintActivity extends Activity implements RemotePrintDocument.Updat 
                PrinterHolder printerHolder = mPrinterHolders.get(i);

                PrinterHolder printerHolder = mPrinterHolders.get(i);

                PrinterId oldPrinterId = printerHolder.printer.getId();

                PrinterId oldPrinterId = printerHolder.printer.getId();

                PrinterInfo updatedPrinter = newPrintersMap.remove(oldPrinterId);

                PrinterInfo updatedPrinter = newPrintersMap.remove(oldPrinterId);



                if (updatedPrinter != null) {

                if (updatedPrinter != null) {

                    printerHolder.printer = updatedPrinter;

                    printerHolder.printer = updatedPrinter;

                    printerHolder.removed = false;

                    printerHolder.removed = false;

                    onPrinterAvailable(printerHolder.printer);

                    newPrinterHolders.add(printerHolder);

                    newPrinterHolders.add(printerHolder);

                } else if (mCurrentPrinter != null && mCurrentPrinter.getId().equals(oldPrinterId)){

                } else if (mCurrentPrinter != null && mCurrentPrinter.getId().equals(oldPrinterId)){

                    printerHolder.removed = true;

                    printerHolder.removed = true;

                    onPrinterUnavailable(printerHolder.printer);

                    newPrinterHolders.add(printerHolder);

                    newPrinterHolders.add(printerHolder);

                }

                }

            }

            }