fix(feedback): address PR review feedback

- Add @ApiStatus.Experimental to enableFeedbackOnShake/disableFeedbackOnShake
- Add tests for runtime toggle (enable after init, disable after init)
- Fix init() comment to accurately describe idempotent behavior
- Fix javadoc on disableFeedbackOnShake to clarify behavior
- Consolidate duplicate Features sections in changelog

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: antonis

CHANGELOG.md

@@ -5,13 +5,6 @@
 ### Features
 
 - Add `Sentry.enableFeedbackOnShake()` and `Sentry.disableFeedbackOnShake()` for runtime control of shake-to-report ([#5232](https://github.com/getsentry/sentry-java/pull/5232))
-
-### Fixes
-
-- Session Replay: Fix Compose text masking mismatch with weighted text ([#5218](https://github.com/getsentry/sentry-java/pull/5218))
-
-### Features
-
 - Add configurable `IScopesStorageFactory` to `SentryOptions` for providing a custom `IScopesStorage`, e.g. when the default `ThreadLocal`-backed storage is incompatible with non-pinning thread models ([#5199](https://github.com/getsentry/sentry-java/pull/5199))
 - Android: Add `beforeErrorSampling` callback to Session Replay ([#5214](https://github.com/getsentry/sentry-java/pull/5214))
   - Allows filtering which errors trigger replay capture before the `onErrorSampleRate` is checked
@@ -28,6 +21,10 @@
     }
     ```
 
+### Fixes
+
+- Session Replay: Fix Compose text masking mismatch with weighted text ([#5218](https://github.com/getsentry/sentry-java/pull/5218))
+
 ### Dependencies
 
 - Bump OpenTelemetry ([#5225](https://github.com/getsentry/sentry-java/pull/5225))

sentry-android-core/src/main/java/io/sentry/android/core/FeedbackShakeIntegration.java

@@ -147,7 +147,7 @@ private void startShakeDetection(final @NotNull Activity activity) {
     if (options == null) {
       return;
     }
-    // Lazily initialize sensor and thread on first use
+    // Initialize sensor and thread if not already done (idempotent)
     shakeDetector.init(application, options.getLogger());
     // Stop any existing detection (e.g. when transitioning between activities)
     stopShakeDetection();

sentry-android-core/src/test/java/io/sentry/android/core/FeedbackShakeIntegrationTest.kt

@@ -102,4 +102,34 @@ class FeedbackShakeIntegrationTest {
     val sut = fixture.getSut()
     sut.close()
   }
+
+  @Test
+  fun `enabling shake at runtime starts detection on next activity resume`() {
+    val sut = fixture.getSut(useShakeGesture = false)
+    sut.register(fixture.scopes, fixture.options)
+
+    whenever(fixture.activity.getSystemService(any())).thenReturn(null)
+
+    // Shake is disabled, onActivityResumed should not crash
+    sut.onActivityResumed(fixture.activity)
+
+    // Now enable at runtime and resume a new activity
+    fixture.options.feedbackOptions.isUseShakeGesture = true
+    sut.onActivityResumed(fixture.activity)
+    // Should not throw — shake detection attempted (fails gracefully with null SensorManager)
+  }
+
+  @Test
+  fun `disabling shake at runtime stops detection on next activity resume`() {
+    val sut = fixture.getSut(useShakeGesture = true)
+    sut.register(fixture.scopes, fixture.options)
+
+    whenever(fixture.activity.getSystemService(any())).thenReturn(null)
+    sut.onActivityResumed(fixture.activity)
+
+    // Disable at runtime and resume
+    fixture.options.feedbackOptions.isUseShakeGesture = false
+    sut.onActivityResumed(fixture.activity)
+    // Should not throw — detection stopped gracefully
+  }
 }

sentry/src/main/java/io/sentry/Sentry.java

@@ -1373,16 +1373,18 @@ public static void showUserFeedbackDialog(
 
   /**
    * Enables shake-to-report for user feedback. When enabled, shaking the device will show the
-   * feedback dialog. This can be toggled at runtime.
+   * feedback dialog. Takes effect on the next activity transition. This can be toggled at runtime.
    */
+  @ApiStatus.Experimental
   public static void enableFeedbackOnShake() {
     getCurrentScopes().getOptions().getFeedbackOptions().setUseShakeGesture(true);
   }
 
   /**
-   * Disables shake-to-report for user feedback. Shake detection will stop on the next activity
-   * transition.
+   * Disables shake-to-report for user feedback. Takes effect on the next activity transition. If a
+   * shake occurs before the transition, the dialog will not be shown.
    */
+  @ApiStatus.Experimental
   public static void disableFeedbackOnShake() {
     getCurrentScopes().getOptions().getFeedbackOptions().setUseShakeGesture(false);
   }