|
19 | 19 | import android.net.Uri; |
20 | 20 | import android.os.Parcel; |
21 | 21 | import android.os.Parcelable; |
| 22 | +import android.text.TextUtils; |
22 | 23 | import android.util.DisplayMetrics; |
23 | 24 | import android.util.TypedValue; |
24 | 25 |
|
@@ -87,10 +88,10 @@ public CropImageOptions[] newArray(int size) { |
87 | 88 | */ |
88 | 89 | public boolean autoZoomEnabled; |
89 | 90 |
|
90 | | - /** |
91 | | - * if multi-touch should be enabled on the crop box |
92 | | - * default: false |
93 | | - */ |
| 91 | + /** |
| 92 | + * if multi-touch should be enabled on the crop box |
| 93 | + * default: false |
| 94 | + */ |
94 | 95 | public boolean multiTouchEnabled; |
95 | 96 |
|
96 | 97 | /** |
@@ -196,7 +197,7 @@ public CropImageOptions[] newArray(int size) { |
196 | 197 | /** |
197 | 198 | * the title of the {@link CropImageActivity} |
198 | 199 | */ |
199 | | - public String activityTitle; |
| 200 | + public CharSequence activityTitle; |
200 | 201 |
|
201 | 202 | /** |
202 | 203 | * the color to use for action bar items icons |
@@ -373,7 +374,7 @@ protected CropImageOptions(Parcel in) { |
373 | 374 | minCropResultHeight = in.readInt(); |
374 | 375 | maxCropResultWidth = in.readInt(); |
375 | 376 | maxCropResultHeight = in.readInt(); |
376 | | - activityTitle = in.readString(); |
| 377 | + activityTitle = TextUtils.CHAR_SEQUENCE_CREATOR.createFromParcel(in); |
377 | 378 | activityMenuIconColor = in.readInt(); |
378 | 379 | outputUri = in.readParcelable(Uri.class.getClassLoader()); |
379 | 380 | outputCompressFormat = Bitmap.CompressFormat.valueOf(in.readString()); |
@@ -423,7 +424,7 @@ public void writeToParcel(Parcel dest, int flags) { |
423 | 424 | dest.writeInt(minCropResultHeight); |
424 | 425 | dest.writeInt(maxCropResultWidth); |
425 | 426 | dest.writeInt(maxCropResultHeight); |
426 | | - dest.writeString(activityTitle); |
| 427 | + TextUtils.writeToParcel(activityTitle, dest, flags); |
427 | 428 | dest.writeInt(activityMenuIconColor); |
428 | 429 | dest.writeParcelable(outputUri, flags); |
429 | 430 | dest.writeString(outputCompressFormat.name()); |
|
0 commit comments