From 9ed3aeaee10e4c4e44bfe3967db5347576e0633e Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Tue, 19 Dec 2017 12:35:31 -0800
Subject: [android] Tweak TinySDF docs to better describe font-family behavior.

---
 .../src/main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java    | 5 ++++-
 .../main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java    | 4 ++--
 .../src/main/res/layout/activity_local_glyph.xml                     | 2 +-
 .../MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml   | 2 +-
 4 files changed, 8 insertions(+), 5 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 2719d7f016..34be958329 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
@@ -725,9 +725,12 @@ public class MapboxMapOptions implements Parcelable {
   }
 
   /**
-   * Set the font-family for generating glyphs locally for ideographs in the ‘CJK Unified Ideographs’
+   * Set the font family for generating glyphs locally for ideographs in the ‘CJK Unified Ideographs’
    * and ‘Hangul Syllables’ ranges.
    *
+   * The font family argument is passed to {@link android.graphics.Typeface#create(String, int)}.
+   * Default system fonts are defined in '/system/etc/fonts.xml'
+   *
    * @param fontFamily font family for local ideograph generation.
    * @return This
    */
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
index 920a1270ac..181d28191a 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/text/LocalGlyphRasterizer.java
@@ -14,14 +14,14 @@ public class LocalGlyphRasterizer {
 
   /***
    * Uses Android-native drawing code to rasterize a single glyph
-   * to a square @{link Bitmap} which can be returned to portable
+   * to a square {@link Bitmap} which can be returned to portable
    * code for transformation into a Signed Distance Field glyph.
    *
    * @param fontFamily Font family string to pass to Typeface.create
    * @param bold If true, use Typeface.BOLD option
    * @param glyphID 16-bit Unicode BMP codepoint to draw
    *
-   * @return Return a @{link Bitmap} to be displayed in the requested tile.
+   * @return Return a {@link Bitmap} to be displayed in the requested tile.
    */
   @WorkerThread
   protected static Bitmap drawGlyphBitmap(String fontFamily, boolean bold, char glyphID) {
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
index 856dd24752..1f8bc93d2c 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/layout/activity_local_glyph.xml
@@ -12,6 +12,6 @@
         android:id="@id/mapView"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        app:mapbox_localIdeographFontFamily="Droid Sans" />
+        app:mapbox_localIdeographFontFamily="sans-serif" />
 
 </LinearLayout>
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
index 7acd8b1ef8..a13dd5d876 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/res/values/descriptions.xml
@@ -67,5 +67,5 @@
     <string name="description_textureview_debug">Use TextureView to render the map</string>
     <string name="description_textureview_resize">Resize a map rendered on a TextureView</string>
     <string name="description_textureview_animate">Animate a map rendered on a TextureView</string>
-    <string name="description_local_glyph">Suzhou using Droid Sans for Chinese glyphs</string>
+    <string name="description_local_glyph">Suzhou using local sans-serif for Chinese glyphs</string>
 </resources>
\ No newline at end of file
-- 
cgit v1.2.1