From f2d70aa890f97031a7ff70ace182f90ba0c65d56 Mon Sep 17 00:00:00 2001
From: Chris Loer <chris.loer@gmail.com>
Date: Thu, 7 Dec 2017 16:03:13 -0800
Subject: [android] Fixups for LocalGlyphActivity

---
 .../main/java/com/mapbox/mapboxsdk/maps/MapboxMapOptions.java    | 9 ++++++---
 .../maps/renderer/textureview/TextureViewMapRenderer.java        | 4 +++-
 .../mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java | 2 +-
 3 files changed, 10 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 5d8da05fa8..48c83628d6 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
@@ -306,7 +306,8 @@ public class MapboxMapOptions implements Parcelable {
         typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_enableTilePrefetch, true));
       mapboxMapOptions.renderSurfaceOnTop(
         typedArray.getBoolean(R.styleable.mapbox_MapView_mapbox_enableZMediaOverlay, false));
-      mapboxMapOptions.localIdeographFontFamily(typedArray.getString(R.styleable.mapbox_MapView_mapbox_localIdeographFontFamily));
+      mapboxMapOptions.localIdeographFontFamily(
+        typedArray.getString(R.styleable.mapbox_MapView_mapbox_localIdeographFontFamily));
     } finally {
       typedArray.recycle();
     }
@@ -741,7 +742,7 @@ public class MapboxMapOptions implements Parcelable {
    * and ‘Hangul Syllables’ ranges.
    *
    * @param fontFamily font family for local ideograph generation.
-   * @return
+   * @return This
    */
   public MapboxMapOptions localIdeographFontFamily(String fontFamily) {
     this.localIdeographFontFamily = fontFamily;
@@ -1100,7 +1101,9 @@ public class MapboxMapOptions implements Parcelable {
    *
    * @return Local ideograph font family name.
    */
-  public String getLocalIdeographFontFamily() { return localIdeographFontFamily; }
+  public String getLocalIdeographFontFamily() {
+    return localIdeographFontFamily;
+  }
 
   public static final Parcelable.Creator<MapboxMapOptions> CREATOR = new Parcelable.Creator<MapboxMapOptions>() {
     public MapboxMapOptions createFromParcel(Parcel in) {
diff --git a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java
index 9ebf60051a..dcc95217ff 100644
--- a/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java
+++ b/platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/maps/renderer/textureview/TextureViewMapRenderer.java
@@ -24,7 +24,9 @@ public class TextureViewMapRenderer extends MapRenderer {
    * @param context     the current Context
    * @param textureView the TextureView
    */
-  public TextureViewMapRenderer(@NonNull Context context, @NonNull TextureView textureView, String localIdeographFontFamily) {
+  public TextureViewMapRenderer(@NonNull Context context,
+                                @NonNull TextureView textureView,
+                                String localIdeographFontFamily) {
     super(context, localIdeographFontFamily);
     renderThread = new TextureViewRenderThread(textureView, this);
     renderThread.start();
diff --git a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
index c621e2ead0..bc07765bf7 100644
--- a/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
+++ b/platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/maplayout/LocalGlyphActivity.java
@@ -18,7 +18,7 @@ public class LocalGlyphActivity extends AppCompatActivity {
   @Override
   protected void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
-    setContentView(R.layout.activity_map_simple);
+    setContentView(R.layout.activity_local_glyph);
 
     mapView = (MapView) findViewById(R.id.mapView);
     mapView.onCreate(savedInstanceState);
-- 
cgit v1.2.1