diff options
| author | John Hoford <hoford@google.com> | 2013-09-25 15:46:33 -0700 |
|---|---|---|
| committer | John Hoford <hoford@google.com> | 2013-09-25 15:47:26 -0700 |
| commit | ef3cc52f473f15534f00b61b55b53e93931fef97 (patch) | |
| tree | 5899aa56fac7bcaa2d3a5cee94976bac38b462bc /src/com/android/gallery3d | |
| parent | c0b8a86ec7cb9b54053ca5cb38716a73d1ba171c (diff) | |
| download | android_packages_apps_Gallery2-ef3cc52f473f15534f00b61b55b53e93931fef97.tar.gz android_packages_apps_Gallery2-ef3cc52f473f15534f00b61b55b53e93931fef97.tar.bz2 android_packages_apps_Gallery2-ef3cc52f473f15534f00b61b55b53e93931fef97.zip | |
disable print on older system.
Change-Id: I003aa965c885e6c7f65ade51b024bad400e8e458
Diffstat (limited to 'src/com/android/gallery3d')
| -rw-r--r-- | src/com/android/gallery3d/filtershow/FilterShowActivity.java | 4 | ||||
| -rw-r--r-- | src/com/android/gallery3d/ui/MenuExecutor.java | 2 | ||||
| -rw-r--r-- | src/com/android/gallery3d/util/PrintJob.java | 8 |
3 files changed, 14 insertions, 0 deletions
diff --git a/src/com/android/gallery3d/filtershow/FilterShowActivity.java b/src/com/android/gallery3d/filtershow/FilterShowActivity.java index 0fe1dd558..c89316dab 100644 --- a/src/com/android/gallery3d/filtershow/FilterShowActivity.java +++ b/src/com/android/gallery3d/filtershow/FilterShowActivity.java @@ -993,6 +993,10 @@ public class FilterShowActivity extends FragmentActivity implements OnItemClickL MenuItem undoItem = mMenu.findItem(R.id.undoButton); MenuItem redoItem = mMenu.findItem(R.id.redoButton); MenuItem resetItem = mMenu.findItem(R.id.resetHistoryButton); + MenuItem printItem = mMenu.findItem(R.id.printButton); + if (!PrintJob.systemSupportsPrint()) { + printItem.setVisible(false); + } mMasterImage.getHistory().setMenuItems(undoItem, redoItem, resetItem); } diff --git a/src/com/android/gallery3d/ui/MenuExecutor.java b/src/com/android/gallery3d/ui/MenuExecutor.java index 48cbe73e1..cbf9a8774 100644 --- a/src/com/android/gallery3d/ui/MenuExecutor.java +++ b/src/com/android/gallery3d/ui/MenuExecutor.java @@ -39,6 +39,7 @@ import com.android.gallery3d.data.Path; import com.android.gallery3d.filtershow.crop.CropActivity; import com.android.gallery3d.util.Future; import com.android.gallery3d.util.GalleryUtils; +import com.android.gallery3d.util.PrintJob; import com.android.gallery3d.util.ThreadPool.Job; import com.android.gallery3d.util.ThreadPool.JobContext; @@ -178,6 +179,7 @@ public class MenuExecutor { boolean supportEdit = (supported & MediaObject.SUPPORT_EDIT) != 0; boolean supportInfo = (supported & MediaObject.SUPPORT_INFO) != 0; boolean supportPrint = (supported & MediaObject.SUPPORT_PRINT) != 0; + supportPrint &= PrintJob.systemSupportsPrint(); setMenuItemVisible(menu, R.id.action_delete, supportDelete); setMenuItemVisible(menu, R.id.action_rotate_ccw, supportRotate); diff --git a/src/com/android/gallery3d/util/PrintJob.java b/src/com/android/gallery3d/util/PrintJob.java index c08f078b0..a593c2d90 100644 --- a/src/com/android/gallery3d/util/PrintJob.java +++ b/src/com/android/gallery3d/util/PrintJob.java @@ -22,6 +22,7 @@ import android.graphics.Matrix; import android.graphics.RectF; import android.graphics.pdf.PdfDocument.Page; import android.net.Uri; +import android.os.Build; import android.os.Bundle; import android.os.CancellationSignal; import android.os.ParcelFileDescriptor; @@ -44,6 +45,13 @@ public class PrintJob { // with a worst case of 150 dpi private final static int MAX_PRINT_SIZE = 3500; + /** + * @return true if the system supports print + */ + public static boolean systemSupportsPrint() { + return (android.os.Build.VERSION.SDK_INT > Build.VERSION_CODES.JELLY_BEAN_MR2); + } + public static void printBitmap(final Context context, final String jobName, final Bitmap bitmap) { if (bitmap == null) { |