Skip to content

Commit c5b1f26

Browse files
committed
Merge pull request square#393 from square/jw/doc-clarification
Clarify documentation on config to note it's a prefered value.
2 parents 39b933c + b3971b3 commit c5b1f26

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

checkstyle.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,9 @@
5757
<module name="AvoidStarImport"/>
5858
<module name="IllegalImport"/>
5959
<module name="RedundantImport"/>
60-
<module name="UnusedImports"/>
60+
<module name="UnusedImports">
61+
<property name="processJavadoc" value="true"/>
62+
</module>
6163

6264

6365
<!-- Checks for Size Violations. -->

picasso/src/main/java/com/squareup/picasso/RequestCreator.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717

1818
import android.content.res.Resources;
1919
import android.graphics.Bitmap;
20+
import android.graphics.BitmapFactory;
2021
import android.graphics.drawable.Drawable;
2122
import android.net.Uri;
2223
import android.widget.ImageView;
@@ -175,7 +176,12 @@ public RequestCreator rotate(float degrees, float pivotX, float pivotY) {
175176
return this;
176177
}
177178

178-
/** Decode the image using the specified config. */
179+
/**
180+
* Attempt to decode the image using the specified config.
181+
* <p>
182+
* Note: This value may be ignored by {@link BitmapFactory}. See
183+
* {@link BitmapFactory.Options#inPreferredConfig its documentation for more details.
184+
*/
179185
public RequestCreator config(Bitmap.Config config) {
180186
data.config(config);
181187
return this;

0 commit comments

Comments
 (0)