dkhawk · Oct 29, 2026
diff --git a/README.md b/README.md
@@ -24,6 +24,7 @@ This repository provides a collection of sample applications to help you get sta
 * **[Maps3DSamples/ComposeDemos](Maps3DSamples/ComposeDemos/app/README.md)**: Modern, declarative Jetpack Compose samples built with the `maps3d-compose` library.
 * **[Maps3DSamples/ApiDemos](Maps3DSamples/ApiDemos)**: Showcases fundamental and advanced API features using traditional Android Views in both **[Kotlin](Maps3DSamples/ApiDemos/kotlin-app/README.md)** and **[Java](Maps3DSamples/ApiDemos/java-app/README.md)**.
 * **[PlacesUIKit3D](PlacesUIKit3D/README.md)**: Demonstrates integrating the Places UI Kit (Place Search, Place Autocomplete, and Place Details) with the Maps 3D SDK.
+* **[codelab](codelab/codelab.md)**: **Aloha Explorer** step-by-step codelab (`starter` and `solution` projects) covering 3D camera flights, altitude modes, custom markers, extruded 3D polygons, geodesic polylines, glTF models, popovers, and Jetpack Compose interop.
 * **[Maps3DSamples/advanced](Maps3DSamples/advanced)**: Demonstrates View-interop patterns for bridging `Map3DView` with Jetpack Compose and `ViewModel`.
 * **[snippets](snippets)**: A collection of standalone, extraction-ready code snippets demonstrating standard integration endpoints in both Kotlin and Java. Includes a coordinate checklist mapping tracker listed in [CATALOG.md](snippets/CATALOG.md).
 

diff --git a/codelab/codelab.md b/codelab/codelab.md
diff --git a/codelab/images/balloon_model.png b/codelab/images/balloon_model.png
diff --git a/codelab/images/compose_integration.png b/codelab/images/compose_integration.png
diff --git a/codelab/images/custom_markers.png b/codelab/images/custom_markers.png
diff --git a/codelab/images/extruded_palace.png b/codelab/images/extruded_palace.png
diff --git a/codelab/images/fly_to_honolulu.png b/codelab/images/fly_to_honolulu.png
diff --git a/codelab/images/four_markers.png b/codelab/images/four_markers.png
diff --git a/codelab/images/global_view.png b/codelab/images/global_view.png
diff --git a/codelab/images/polylines.png b/codelab/images/polylines.png
diff --git a/codelab/images/popover_example.png b/codelab/images/popover_example.png
diff --git a/codelab/images/scenic_tour.png b/codelab/images/scenic_tour.png
diff --git a/codelab/solution/app/build.gradle.kts b/codelab/solution/app/build.gradle.kts
@@ -45,26 +45,43 @@ kotlin {
 }
 
 dependencies {
+    // Core AndroidX Activity and edge-to-edge window support
     implementation(libs.androidx.activity)
+    // Jetpack Compose integration for ComponentActivity (setContent)
     implementation(libs.androidx.activity.compose)
+    // AppCompat support for traditional Android Views (AppCompatActivity)
     implementation(libs.androidx.appcompat)
+    // ConstraintLayout for positioning the 3D map and bottom control bar
     implementation(libs.androidx.constraintlayout)
+    // Kotlin extensions for core Android framework APIs
     implementation(libs.androidx.core.ktx)
+    // Lifecycle-aware coroutine scopes (lifecycleScope) and DefaultLifecycleObserver
     implementation(libs.androidx.lifecycle.runtime.ktx)
+    // Material Design 3 components for Jetpack Compose
     implementation(libs.androidx.material3)
+    // Core Jetpack Compose UI primitives and AndroidView interop
     implementation(libs.androidx.ui)
+    // Jetpack Compose graphics and color utilities
     implementation(libs.androidx.ui.graphics)
+    // Android Studio preview support for @Composable functions
     implementation(libs.androidx.ui.tooling.preview)
+    // Material Design components for Android Views
     implementation(libs.material)
+    // Compose Bill of Materials (BOM) to align Compose library versions
     implementation(platform(libs.androidx.compose.bom))
 
+    // Compose UI inspection and tooling in debug builds
     debugImplementation(libs.androidx.ui.tooling)
 
+    // JUnit 4 framework for local JVM unit tests
     testImplementation(libs.junit)
 
+    // AndroidX JUnit runner extensions for instrumented tests
     androidTestImplementation(libs.androidx.junit)
+    // Espresso UI testing framework for instrumented tests
     androidTestImplementation(libs.androidx.espresso.core)
 
+    // Google Play Services Maps 3D SDK for 3D map rendering, camera animations, markers, polygons, and glTF models
     implementation(libs.play.services.maps3d)
 }
 
@@ -77,11 +94,3 @@ secrets {
     // checked in version control.
     defaultPropertiesFileName = "local.defaults.properties"
 }
-
-tasks.register<Exec>("launchDebug") {
-    dependsOn("installDebug")
-    commandLine("adb", "shell", "am", "start", "-n", "com.example.alohaexplorer/.MainActivity")
-    doLast {
-        println("Launched com.example.alohaexplorer/.MainActivity")
-    }
-}
diff --git a/...ab/solution/app/src/androidTest/java/com/example/alohaexplorer/ExampleInstrumentedTest.kt b/...ab/solution/app/src/androidTest/java/com/example/alohaexplorer/ExampleInstrumentedTest.kt
@@ -1,13 +1,11 @@
 package com.example.alohaexplorer
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *
@@ -21,4 +19,4 @@ class ExampleInstrumentedTest {
         val appContext = InstrumentationRegistry.getInstrumentation().targetContext
         assertEquals("com.example.alohaexplorer", appContext.packageName)
     }
-}
+}
diff --git a/codelab/solution/app/src/main/AndroidManifest.xml b/codelab/solution/app/src/main/AndroidManifest.xml
@@ -2,7 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools">
 
+    <!-- Step 1: Internet Permission is required for loading tiles and models -->
     <uses-permission android:name="android.permission.INTERNET" />
+
     <application
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
@@ -15,22 +17,22 @@
 
         <meta-data
             android:name="com.google.android.geo.maps3d.API_KEY"
-            android:value="${MAPS3D_API_KEY}"
-            />
+            android:value="${MAPS3D_API_KEY}" />
 
         <activity
             android:name=".MainActivity"
             android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
         <activity
             android:name=".Map3DComposeActivity"
             android:exported="true"
-            android:label="Aloha Compose" />
+            android:label="@string/title_activity_compose" />
     </application>
 
 </manifest>
diff --git a/codelab/solution/app/src/main/java/com/example/alohaexplorer/HonoluluData.kt b/codelab/solution/app/src/main/java/com/example/alohaexplorer/HonoluluData.kt
@@ -43,8 +43,8 @@ val KOKO_HEAD = latLngAltitude {
 }
 
 val PEARL_HARBOR = latLngAltitude {
-    latitude = 21.31861
-    longitude = -157.92250
+    latitude = 21.3649
+    longitude = -157.9500
     altitude = 0.0
 }
 
@@ -105,6 +105,17 @@ val CUSTOM_MARKER_CAMERA = camera {
     this.range = 1399.0
 }
 
+val POLYLINE_CAMERA = camera {
+    center = latLngAltitude {
+        latitude = 21.2917
+        longitude = -157.8437
+        altitude = 0.0
+    }
+    tilt = 55.0
+    range = 5500.0
+    heading = 35.0
+}
+
 val BALLOON_CAMERA = camera {
     center = WAIKIKI
     tilt = 60.0