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

Commit 3c4e33a4 authored Mar 30, 2018 by Leon Scroggins Committed by Android (Google) Code Review Mar 30, 2018

Merge changes from topics "DocumentSource", "ID_API" into pi-dev

* changes:
  Add documentation for ImageDecoder and its Source
  Rename getters and setters on ImageDecoder

parents 5d270977 0a87cb31

api/current.txt

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -13646,22 +13646,22 @@ package android.graphics {
	method public int getAllocator();		method public int getAllocator();
	method public boolean getConserveMemory();		method public boolean getConserveMemory();
	method public android.graphics.Rect getCrop();		method public android.graphics.Rect getCrop();
	method public boolean getDecodeAsAlphaMask();
	method public boolean getMutable();
	method public android.graphics.ImageDecoder.OnPartialImageListener getOnPartialImageListener();		method public android.graphics.ImageDecoder.OnPartialImageListener getOnPartialImageListener();
	method public android.graphics.PostProcessor getPostProcessor();		method public android.graphics.PostProcessor getPostProcessor();
	method public boolean getRequireUnpremultiplied();		method public boolean isDecodeAsAlphaMaskEnabled();
			method public boolean isMutableRequired();
			method public boolean isUnpremultipliedRequired();
	method public android.graphics.ImageDecoder setAllocator(int);		method public android.graphics.ImageDecoder setAllocator(int);
	method public android.graphics.ImageDecoder setConserveMemory(boolean);		method public android.graphics.ImageDecoder setConserveMemory(boolean);
	method public android.graphics.ImageDecoder setCrop(android.graphics.Rect);		method public android.graphics.ImageDecoder setCrop(android.graphics.Rect);
	method public android.graphics.ImageDecoder setDecodeAsAlphaMask(boolean);		method public android.graphics.ImageDecoder setDecodeAsAlphaMaskEnabled(boolean);
	method public android.graphics.ImageDecoder setMutable(boolean);		method public android.graphics.ImageDecoder setMutableRequired(boolean);
	method public android.graphics.ImageDecoder setOnPartialImageListener(android.graphics.ImageDecoder.OnPartialImageListener);		method public android.graphics.ImageDecoder setOnPartialImageListener(android.graphics.ImageDecoder.OnPartialImageListener);
	method public android.graphics.ImageDecoder setPostProcessor(android.graphics.PostProcessor);		method public android.graphics.ImageDecoder setPostProcessor(android.graphics.PostProcessor);
	method public android.graphics.ImageDecoder setRequireUnpremultiplied(boolean);
	method public android.graphics.ImageDecoder setTargetColorSpace(android.graphics.ColorSpace);		method public android.graphics.ImageDecoder setTargetColorSpace(android.graphics.ColorSpace);
	method public android.graphics.ImageDecoder setTargetSampleSize(int);		method public android.graphics.ImageDecoder setTargetSampleSize(int);
	method public android.graphics.ImageDecoder setTargetSize(int, int);		method public android.graphics.ImageDecoder setTargetSize(int, int);
			method public android.graphics.ImageDecoder setUnpremultipliedRequired(boolean);
	field public static final int ALLOCATOR_DEFAULT = 0; // 0x0		field public static final int ALLOCATOR_DEFAULT = 0; // 0x0
	field public static final int ALLOCATOR_HARDWARE = 3; // 0x3		field public static final int ALLOCATOR_HARDWARE = 3; // 0x3
	field public static final int ALLOCATOR_SHARED_MEMORY = 2; // 0x2		field public static final int ALLOCATOR_SHARED_MEMORY = 2; // 0x2

api/removed.txt

+6 −0

Original line number	Original line	Diff line number	Diff line
	@@ -183,7 +183,13 @@ package android.graphics {

	public final class ImageDecoder implements java.lang.AutoCloseable {		public final class ImageDecoder implements java.lang.AutoCloseable {
	method public deprecated boolean getAsAlphaMask();		method public deprecated boolean getAsAlphaMask();
			method public deprecated boolean getDecodeAsAlphaMask();
			method public deprecated boolean getMutable();
			method public deprecated boolean getRequireUnpremultiplied();
	method public deprecated android.graphics.ImageDecoder setAsAlphaMask(boolean);		method public deprecated android.graphics.ImageDecoder setAsAlphaMask(boolean);
			method public deprecated android.graphics.ImageDecoder setDecodeAsAlphaMask(boolean);
			method public deprecated android.graphics.ImageDecoder setMutable(boolean);
			method public deprecated android.graphics.ImageDecoder setRequireUnpremultiplied(boolean);
	method public deprecated android.graphics.ImageDecoder setResize(int, int);		method public deprecated android.graphics.ImageDecoder setResize(int, int);
	method public deprecated android.graphics.ImageDecoder setResize(int);		method public deprecated android.graphics.ImageDecoder setResize(int);
	field public static final deprecated int ERROR_SOURCE_ERROR = 3; // 0x3		field public static final deprecated int ERROR_SOURCE_ERROR = 3; // 0x3

graphics/java/android/graphics/ImageDecoder.java

+190 −32

File changed.

Preview size limit exceeded, changes collapsed.