rebase main

.gitignore

@@ -26,4 +26,5 @@ examples.zip
 release-docs/
 release-docs.zip
 /tmp/checksum.txt
+api_compat_report/
 **/src/main/assets/sdk_versions/

Makefile

@@ -28,12 +28,14 @@ build:
 	./gradlew plugin-lifecycle:assembleRelease;
 
 # Use `make checkApi TAG=ReleaseTag` to check the release tag or `make checkApi` to check current branch while running locally.
+# Note: if run locally, execute `mbx env` and `./gradlew assembleRelease` first.
 .PHONY: checkApi
 checkApi:
 	unset GITHUB_TOKEN; \
 	echo "$(shell mbx-ci github reader token)" > gh_token.txt;\
 	sh scripts/java-api-check-all.sh "$(TAG)"
 
+# Note: if run locally, execute `mbx env` first.
 .PHONY: checkChangelog
 checkChangelog:
 	unset GITHUB_TOKEN; \
@@ -77,6 +79,7 @@ generate-changelog:
 
 # Use `make update-android-docs TAG=YourReleaseTag` while running locally.
 # Run `make prepare-release-doc` first in the internal repository,
+# Note: if run locally, execute `mbx env` first.
 .PHONY: update-android-docs
 update-android-docs:
 	unset GITHUB_TOKEN; \

app/src/main/java/com/mapbox/maps/testapp/examples/LocationComponentActivity.kt

@@ -11,7 +11,6 @@ import com.mapbox.maps.Style
 import com.mapbox.maps.extension.style.expressions.dsl.generated.interpolate
 import com.mapbox.maps.plugin.LocationPuck2D
 import com.mapbox.maps.plugin.LocationPuck3D
-import com.mapbox.maps.plugin.PuckBearingSource
 import com.mapbox.maps.plugin.gestures.gestures
 import com.mapbox.maps.plugin.locationcomponent.*
 import com.mapbox.maps.testapp.R
@@ -101,16 +100,6 @@ class LocationComponentActivity : AppCompatActivity() {
         }
         return true
       }
-      R.id.heading -> {
-        binding.mapView.location.updateSettings { puckBearingSource = PuckBearingSource.HEADING }
-        item.isChecked = true
-        return true
-      }
-      R.id.course -> {
-        binding.mapView.location.updateSettings { puckBearingSource = PuckBearingSource.COURSE }
-        item.isChecked = true
-        return true
-      }
       else -> return super.onOptionsItemSelected(item)
     }
   }

app/src/main/res/layout/activity_location_component.xml

@@ -6,5 +6,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     mapbox:mapbox_locationComponentEnabled = "true"
-    mapbox:mapbox_locationComponentPuckBearingSource = "heading"
     tools:context=".examples.LocationComponentActivity" />

app/src/main/res/layout/generated_test_locationcomponent.xml

@@ -9,7 +9,6 @@
     mapbox:mapbox_locationComponentPulsingMaxRadius = "10dp"
     mapbox:mapbox_locationComponentLayerAbove = "testString"
     mapbox:mapbox_locationComponentLayerBelow = "testString"
-    mapbox:mapbox_locationComponentPuckBearingSource = "heading"
     android:layout_width="match_parent"
     android:layout_height="match_parent" />
 <!-- End of generated file. -->

app/src/main/res/menu/menu_location_component.xml

@@ -16,26 +16,11 @@
     <item android:id="@+id/action_component_enabled"
         android:title="@string/location_enable_component"
         app:showAsAction="never"/>
-
     <item android:id="@+id/action_show_bearing"
         android:title="@string/location_show_bearing"
         app:showAsAction="never"/>
 
     <item android:id="@+id/action_hide_bearing"
         android:title="@string/location_hide_bearing"
         app:showAsAction="never"/>
-
-    <group
-        android:id="@+id/group"
-        android:checkableBehavior="single">
-    <item
-        android:id="@+id/heading"
-        android:title="@string/heading"
-        android:checked="true"
-        app:showAsAction="never" />
-    <item
-        android:id="@+id/course"
-        android:title="@string/course"
-        app:showAsAction="never" />
-    </group>
 </menu>

app/src/main/res/values/strings.xml

@@ -121,10 +121,6 @@
     <string name="change_language_instruction">Make sure that the device\'s default language is not English</string>
     <string name="map_not_localized">Map localized to selected language</string>
     <string name="map_localized">Map localized to device language</string>
-
-    <!--Location component Activity-->
-    <string name="heading">Bearing source: Heading</string>
-    <string name="course">Bearing source: Course</string>
     <string name="english">English</string>
     <string name="spanish">Spanish</string>
     <string name="french">French</string>