summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkevin <kevin.li@mapbox.com>2019-02-18 09:30:23 +0800
committerkevin <kevin.li@mapbox.com>2019-02-18 09:30:23 +0800
commit5ac1b5e57c934f5e4088632520178bdc37e06ee0 (patch)
tree933fce216dba85c6eae0e04c8baee20248a497f2
parent21c338b622f27fa0d82d86a6a6998ff931144d2d (diff)
downloadqtlocation-mapboxgl-upstream/localfont.tar.gz
Add javadocs for local font familyupstream/localfont
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java2
-rw-r--r--platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java4
2 files changed, 5 insertions, 1 deletions
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
index 127d414750..8f438b5edf 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java
@@ -594,6 +594,7 @@ public class MapboxMapOptions implements Parcelable {
* <p>
* The font family argument is passed to {@link android.graphics.Typeface#create(String, int)}.
* Default system fonts are defined in &#x27;/system/etc/fonts.xml&#x27;
+ * Default font for local ideograph font family is "sans-serif".
*
* @param fontFamily font family for local ideograph generation.
* @return This
@@ -887,6 +888,7 @@ public class MapboxMapOptions implements Parcelable {
/**
* Returns the font-family for locally overriding generation of glyphs in the
* &#x27;CJK Unified Ideographs&#x27; and &#x27;Hangul Syllables&#x27; ranges.
+ * Default font for local ideograph font family is "sans-serif".
*
* @return Local ideograph font family name.
*/
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java
index f4340e333a..24159c5a2f 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/snapshotter/MapSnapshotter.java
@@ -183,6 +183,7 @@ public class MapSnapshotter {
* <p>
* The font family argument is passed to {@link android.graphics.Typeface#create(String, int)}.
* Default system fonts are defined in &#x27;/system/etc/fonts.xml&#x27;
+ * Default font for local ideograph font family is "sans-serif".
*
* @param fontFamily font family for local ideograph generation.
* @return the mutated {@link Options}
@@ -250,7 +251,8 @@ public class MapSnapshotter {
}
/**
- * @return the font family used for locally generating ideographs
+ * @return the font family used for locally generating ideographs,
+ * Default font for local ideograph font family is "sans-serif".
*/
public String getLocalIdeographFontFamily() {
return localIdeographFontFamily;