[ios] Add telemetry setting directly to attribution button action sheet

- Deprecate and no-op `+[MGLAccountManager mapboxMetricsEnabledSettingShownInApp]`
- Check for attribution button hiding and make sure ToS are understood

2 files changed, 11 insertions, 8 deletions

diff --git a/include/mbgl/ios/MGLAccountManager.h b/include/mbgl/ios/MGLAccountManager.h
index 2b3b1784f6..c52ef08607 100644
--- a/include/mbgl/ios/MGLAccountManager.h
+++ b/include/mbgl/ios/MGLAccountManager.h
@@ -26,12 +26,7 @@ NS_ASSUME_NONNULL_BEGIN
  */
 + (nullable NSString *)accessToken;
 
-#pragma mark Providing User Metrics Opt-Out
-
-/**
- Whether in-app user metrics opt-out is configured. If set to the default value of `NO`, a user opt-out preference is expected in a `Settings.bundle` that shows in the application's section within the system Settings app.
- */
-+ (BOOL)mapboxMetricsEnabledSettingShownInApp;
++ (BOOL)mapboxMetricsEnabledSettingShownInApp __attribute__((deprecated("Telemetry settings are now always shown in the ℹ️ menu.")));
 
 @end
 
diff --git a/include/mbgl/ios/MGLMapView.h b/include/mbgl/ios/MGLMapView.h
index feb5c6d630..ba7895b81f 100644
--- a/include/mbgl/ios/MGLMapView.h
+++ b/include/mbgl/ios/MGLMapView.h
@@ -129,8 +129,8 @@ IB_DESIGNABLE
 @property (nonatomic, readonly) UIImageView *logoView;
 
 /** 
- A view showing legally required copyright notices, positioned at the
- bottom-right of the map view.
+ A view showing legally required copyright notices and telemetry settings,
+ positioned at the bottom-right of the map view.
  
  @note The Mapbox terms of service, which governs the use of Mapbox-hosted
     vector tiles and styles,
@@ -139,6 +139,14 @@ IB_DESIGNABLE
     OpenStreetMap data, or other Mapbox data such as satellite or terrain
     data. If that applies to this map view, do not hide this view or remove
     any notices from it.
+
+ @note You are additionally
+    [required](https://www.mapbox.com/help/metrics-opt-out-for-users/) to
+    provide users with the option to disable anonymous usage and location
+    sharing (telemetry). If this view is hidden, you must implement this
+    setting elsewhere in your app or via `Settings.bundle`. See our
+    [website](https://www.mapbox.com/ios-sdk/#telemetry_opt_out) for
+    implementation help.
  */
 @property (nonatomic, readonly) UIButton *attributionButton;