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

Commit bb9f686b authored by Philip P. Moltmann's avatar Philip P. Moltmann
Browse files

Allow a print service to specify per printer icons, description and 

info-activities

The icon is loaded from the discovery session only when it is displayed
to avoid having to store too many icons in memory.

Also the icons are not maintained in the historical printers. Only if
the printers are available nice icons are shown. A historical printer is
updated with the appropriate properties (including icon) once it becomes
available.

Bug: 24135005
Change-Id: Iec389bab514b024634be8fb5fc8928371cba8740
parent b819f898

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -499,6 +499,7 @@ aidl_files := \ 
	frameworks/base/graphics/java/android/graphics/PointF.aidl \

	frameworks/base/graphics/java/android/graphics/RectF.aidl \

	frameworks/base/graphics/java/android/graphics/Rect.aidl \

	frameworks/base/graphics/java/android/graphics/drawable/Icon.aidl \

	frameworks/base/core/java/android/accounts/AuthenticatorDescription.aidl \

	frameworks/base/core/java/android/accounts/Account.aidl \

	frameworks/base/core/java/android/app/admin/SystemUpdatePolicy.aidl \

api/current.txt

+8 −0
Original line number Diff line number Diff line
@@ -28873,6 +28873,9 @@ package android.print { 
    method public android.print.PrinterInfo build();

    method public android.print.PrinterInfo.Builder setCapabilities(android.print.PrinterCapabilitiesInfo);

    method public android.print.PrinterInfo.Builder setDescription(java.lang.String);

    method public android.print.PrinterInfo.Builder setHasCustomPrinterIcon();

    method public android.print.PrinterInfo.Builder setIconResourceId(int);

    method public android.print.PrinterInfo.Builder setInfoIntent(android.app.PendingIntent);

    method public android.print.PrinterInfo.Builder setName(java.lang.String);

    method public android.print.PrinterInfo.Builder setStatus(int);

  }
@@ -28893,6 +28896,10 @@ package android.print.pdf { 














package android.printservice {



























  public class CustomPrinterIconCallback {













    method public boolean onCustomPrinterIconLoaded(android.graphics.drawable.Icon);













  }



























  public final class PrintDocument {















    method public android.os.ParcelFileDescriptor getData();















    method public android.print.PrintDocumentInfo getInfo();










@@ -28948,6 +28955,7 @@ package android.printservice {













    method public final boolean isDestroyed();















    method public final boolean isPrinterDiscoveryStarted();















    method public abstract void onDestroy();













    method public void onRequestCustomPrinterIcon(android.print.PrinterId, android.printservice.CustomPrinterIconCallback);















    method public abstract void onStartPrinterDiscovery(java.util.List<android.print.PrinterId>);















    method public abstract void onStartPrinterStateTracking(android.print.PrinterId);















    method public abstract void onStopPrinterDiscovery();

























api/system-current.txt



+8
−0




























Original line number
Diff line number
Diff line








@@ -30883,6 +30883,9 @@ package android.print {













    method public android.print.PrinterInfo build();















    method public android.print.PrinterInfo.Builder setCapabilities(android.print.PrinterCapabilitiesInfo);















    method public android.print.PrinterInfo.Builder setDescription(java.lang.String);













    method public android.print.PrinterInfo.Builder setHasCustomPrinterIcon();













    method public android.print.PrinterInfo.Builder setIconResourceId(int);













    method public android.print.PrinterInfo.Builder setInfoIntent(android.app.PendingIntent);















    method public android.print.PrinterInfo.Builder setName(java.lang.String);















    method public android.print.PrinterInfo.Builder setStatus(int);















  }









@@ -30903,6 +30906,10 @@ package android.print.pdf {



























package android.printservice {



























  public class CustomPrinterIconCallback {













    method public boolean onCustomPrinterIconLoaded(android.graphics.drawable.Icon);













  }



























  public final class PrintDocument {















    method public android.os.ParcelFileDescriptor getData();















    method public android.print.PrintDocumentInfo getInfo();










@@ -30958,6 +30965,7 @@ package android.printservice {













    method public final boolean isDestroyed();















    method public final boolean isPrinterDiscoveryStarted();















    method public abstract void onDestroy();













    method public void onRequestCustomPrinterIcon(android.print.PrinterId, android.printservice.CustomPrinterIconCallback);















    method public abstract void onStartPrinterDiscovery(java.util.List<android.print.PrinterId>);















    method public abstract void onStartPrinterStateTracking(android.print.PrinterId);















    method public abstract void onStopPrinterDiscovery();

























api/test-current.txt



+9
−0




























Original line number
Diff line number
Diff line








@@ -28862,6 +28862,7 @@ package android.print {













    method public android.print.PrinterId getId();















    method public java.lang.String getName();















    method public int getStatus();













    method public android.graphics.drawable.Drawable loadIcon(android.content.Context);















    method public void writeToParcel(android.os.Parcel, int);















    field public static final android.os.Parcelable.Creator<android.print.PrinterInfo> CREATOR;















    field public static final int STATUS_BUSY = 2; // 0x2









@@ -28875,6 +28876,9 @@ package android.print {













    method public android.print.PrinterInfo build();















    method public android.print.PrinterInfo.Builder setCapabilities(android.print.PrinterCapabilitiesInfo);















    method public android.print.PrinterInfo.Builder setDescription(java.lang.String);













    method public android.print.PrinterInfo.Builder setHasCustomPrinterIcon();













    method public android.print.PrinterInfo.Builder setIconResourceId(int);













    method public android.print.PrinterInfo.Builder setInfoIntent(android.app.PendingIntent);















    method public android.print.PrinterInfo.Builder setName(java.lang.String);















    method public android.print.PrinterInfo.Builder setStatus(int);















  }









@@ -28895,6 +28899,10 @@ package android.print.pdf {



























package android.printservice {



























  public class CustomPrinterIconCallback {













    method public boolean onCustomPrinterIconLoaded(android.graphics.drawable.Icon);













  }



























  public final class PrintDocument {















    method public android.os.ParcelFileDescriptor getData();















    method public android.print.PrintDocumentInfo getInfo();










@@ -28950,6 +28958,7 @@ package android.printservice {













    method public final boolean isDestroyed();















    method public final boolean isPrinterDiscoveryStarted();















    method public abstract void onDestroy();













    method public void onRequestCustomPrinterIcon(android.print.PrinterId, android.printservice.CustomPrinterIconCallback);















    method public abstract void onStartPrinterDiscovery(java.util.List<android.print.PrinterId>);















    method public abstract void onStartPrinterStateTracking(android.print.PrinterId);















    method public abstract void onStopPrinterDiscovery();

























core/java/android/print/IPrintManager.aidl



+14
−0




























Original line number
Diff line number
Diff line








@@ -16,6 +16,7 @@





























package android.print;





























import android.graphics.drawable.Icon;















import android.os.Bundle;















import android.print.IPrinterDiscoveryObserver;















import android.print.IPrintDocumentAdapter;










@@ -53,6 +54,19 @@ interface IPrintManager {













    void stopPrinterDiscovery(in IPrinterDiscoveryObserver observer, int userId);















    void validatePrinters(in List<PrinterId> printerIds, int userId);















    void startPrinterStateTracking(in PrinterId printerId, int userId);



























    /**













     * Get the custom icon for a printer. If the icon is not cached, the icon is













     * requested asynchronously. Once it is available the printer is updated.













     *













     * @param printerId the id of the printer the icon should be loaded for













     * @param userId the id of the user requesting the printer













     * @return the custom icon to be used for the printer or null if the icon is













     *         not yet available













     * @see android.print.PrinterInfo.Builder#setHasCustomPrinterIcon()













     */













    Icon getCustomPrinterIcon(in PrinterId printerId, int userId);





























    void stopPrinterStateTracking(in PrinterId printerId, int userId);















    void destroyPrinterDiscoverySession(in IPrinterDiscoveryObserver observer,















            int userId);