diff options
Diffstat (limited to 'packages/PrintSpooler/src/com')
3 files changed, 30 insertions, 33 deletions
diff --git a/packages/PrintSpooler/src/com/android/printspooler/FusedPrintersProvider.java b/packages/PrintSpooler/src/com/android/printspooler/FusedPrintersProvider.java index e47bf0c..0431b94 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/FusedPrintersProvider.java +++ b/packages/PrintSpooler/src/com/android/printspooler/FusedPrintersProvider.java @@ -455,7 +455,7 @@ public class FusedPrintersProvider extends Loader<List<PrinterInfo>> { PrinterInfo.Builder builder = new PrinterInfo.Builder(printerId, name, status); builder.setDescription(description); - PrinterInfo printer = builder.create(); + PrinterInfo printer = builder.build(); outPrinters.add(printer); diff --git a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java index 514e8ca..5c3d700 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java +++ b/packages/PrintSpooler/src/com/android/printspooler/PrintJobConfigActivity.java @@ -147,9 +147,8 @@ public class PrintJobConfigActivity extends Activity { public static final PageRange[] ALL_PAGES_ARRAY = new PageRange[] {PageRange.ALL_PAGES}; - private final PrintAttributes mOldPrintAttributes = new PrintAttributes.Builder().create(); - private final PrintAttributes mCurrPrintAttributes = new PrintAttributes.Builder().create(); - private final PrintAttributes mTempPrintAttributes = new PrintAttributes.Builder().create(); + private final PrintAttributes mOldPrintAttributes = new PrintAttributes.Builder().build(); + private final PrintAttributes mCurrPrintAttributes = new PrintAttributes.Builder().build(); private final DeathRecipient mDeathRecipient = new DeathRecipient() { @Override @@ -851,19 +850,19 @@ public class PrintJobConfigActivity extends Activity { Resolution oldResolution = mCurrPrintAttributes.getResolution(); Resolution newResolution = new Resolution( oldResolution.getId(), - oldResolution.getLabel(getPackageManager()), + oldResolution.getLabel(), oldResolution.getVerticalDpi(), oldResolution.getHorizontalDpi()); mCurrPrintAttributes.setResolution(newResolution); // Rotate the physical margins. - Margins oldMargins = mCurrPrintAttributes.getMargins(); - Margins newMargins = new Margins( - oldMargins.getBottomMils(), - oldMargins.getLeftMils(), - oldMargins.getTopMils(), - oldMargins.getRightMils()); - mCurrPrintAttributes.setMargins(newMargins); + Margins oldMinMargins = mCurrPrintAttributes.getMinMargins(); + Margins newMinMargins = new Margins( + oldMinMargins.getBottomMils(), + oldMinMargins.getLeftMils(), + oldMinMargins.getTopMils(), + oldMinMargins.getRightMils()); + mCurrPrintAttributes.setMinMargins(newMinMargins); } } else { if (mediaSize.isPortrait()) { @@ -874,26 +873,25 @@ public class PrintJobConfigActivity extends Activity { Resolution oldResolution = mCurrPrintAttributes.getResolution(); Resolution newResolution = new Resolution( oldResolution.getId(), - oldResolution.getLabel(getPackageManager()), + oldResolution.getLabel(), oldResolution.getVerticalDpi(), oldResolution.getHorizontalDpi()); mCurrPrintAttributes.setResolution(newResolution); // Rotate the physical margins. - Margins oldMargins = mCurrPrintAttributes.getMargins(); + Margins oldMinMargins = mCurrPrintAttributes.getMinMargins(); Margins newMargins = new Margins( - oldMargins.getTopMils(), - oldMargins.getRightMils(), - oldMargins.getBottomMils(), - oldMargins.getLeftMils()); - mCurrPrintAttributes.setMargins(newMargins); + oldMinMargins.getTopMils(), + oldMinMargins.getRightMils(), + oldMinMargins.getBottomMils(), + oldMinMargins.getLeftMils()); + mCurrPrintAttributes.setMinMargins(newMargins); } } } private void updatePrintAttributes(PrinterCapabilitiesInfo capabilities) { - PrintAttributes defaults = mTempPrintAttributes; - capabilities.getDefaults(defaults); + PrintAttributes defaults = capabilities.getDefaults(); // Media size. MediaSize currMediaSize = mCurrPrintAttributes.getMediaSize(); @@ -925,16 +923,16 @@ public class PrintJobConfigActivity extends Activity { } // Margins. - Margins margins = mCurrPrintAttributes.getMargins(); + Margins margins = mCurrPrintAttributes.getMinMargins(); if (margins == null) { - mCurrPrintAttributes.setMargins(defaults.getMargins()); + mCurrPrintAttributes.setMinMargins(defaults.getMinMargins()); } else { Margins minMargins = capabilities.getMinMargins(); if (margins.getLeftMils() < minMargins.getLeftMils() || margins.getTopMils() < minMargins.getTopMils() || margins.getRightMils() > minMargins.getRightMils() || margins.getBottomMils() > minMargins.getBottomMils()) { - mCurrPrintAttributes.setMargins(defaults.getMargins()); + mCurrPrintAttributes.setMinMargins(defaults.getMinMargins()); } } } @@ -1633,8 +1631,7 @@ public class PrintJobConfigActivity extends Activity { PrinterInfo printer = (PrinterInfo) mDestinationSpinner.getSelectedItem(); PrinterCapabilitiesInfo capabilities = printer.getCapabilities(); - PrintAttributes defaultAttributes = mTempPrintAttributes; - printer.getCapabilities().getDefaults(defaultAttributes); + PrintAttributes defaultAttributes = printer.getCapabilities().getDefaults(); // Media size. List<MediaSize> mediaSizes = capabilities.getMediaSizes(); @@ -2069,12 +2066,12 @@ public class PrintJobConfigActivity extends Activity { .setColorModes(PrintAttributes.COLOR_MODE_COLOR | PrintAttributes.COLOR_MODE_MONOCHROME, PrintAttributes.COLOR_MODE_COLOR) - .create(); + .build(); return new PrinterInfo.Builder(printerId, getString(R.string.save_as_pdf), PrinterInfo.STATUS_IDLE) .setCapabilities(capabilities) - .create(); + .build(); } } } diff --git a/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java b/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java index 76e548a..8580fcd 100644 --- a/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java +++ b/packages/PrintSpooler/src/com/android/printspooler/PrintSpoolerService.java @@ -839,11 +839,11 @@ public final class PrintSpoolerService extends Service { serializer.attribute(null, ATTR_VERTICAL_DPI, String.valueOf( resolution.getVerticalDpi())); serializer.attribute(null, ATTR_LABEL, - resolution.getLabel(getPackageManager())); + resolution.getLabel()); serializer.endTag(null, TAG_RESOLUTION); } - Margins margins = attributes.getMargins(); + Margins margins = attributes.getMinMargins(); if (margins != null) { serializer.startTag(null, TAG_MARGINS); serializer.attribute(null, ATTR_LEFT_MILS, String.valueOf( @@ -1056,14 +1056,14 @@ public final class PrintSpoolerService extends Service { final int bottomMils = Integer.parseInt(parser.getAttributeValue(null, ATTR_BOTTOM_MILS)); Margins margins = new Margins(leftMils, topMils, rightMils, bottomMils); - builder.setMargins(margins); + builder.setMinMargins(margins); parser.next(); skipEmptyTextTags(parser); expect(parser, XmlPullParser.END_TAG, TAG_MARGINS); parser.next(); } - printJob.setAttributes(builder.create()); + printJob.setAttributes(builder.build()); skipEmptyTextTags(parser); expect(parser, XmlPullParser.END_TAG, TAG_ATTRIBUTES); @@ -1079,7 +1079,7 @@ public final class PrintSpoolerService extends Service { ATTR_CONTENT_TYPE)); PrintDocumentInfo info = new PrintDocumentInfo.Builder(name) .setPageCount(pageCount) - .setContentType(contentType).create(); + .setContentType(contentType).build(); printJob.setDocumentInfo(info); parser.next(); skipEmptyTextTags(parser); |