diff --git a/docs/platforms/android/user-feedback/configuration/index.mdx b/docs/platforms/android/user-feedback/configuration/index.mdx
new file mode 100644
index 00000000000000..0322a98bc18bf0
--- /dev/null
+++ b/docs/platforms/android/user-feedback/configuration/index.mdx
@@ -0,0 +1,235 @@
+---
+title: Configure User Feedback
+sidebar_order: 6900
+description: "Learn about general User Feedback configuration fields."
+---
+
+## User Feedback Widget
+
+The User Feedback Widget offers many customization options, and if the available options are insufficient, you can [use your own UI](#bring-your-own-widget).
+
+### General
+
+Some hooks are available so you can react to the user opening and closing the form, when the user successfully submits the form or when there is an error:
+
+| Hook | Type | Description |
+| ----------------- | ------------------------- | ------------------------------------------------------------------------ |
+| `onFormOpen` | `() -> Void` | Called when the feedback form is opened. |
+| `onFormClose` | `() -> Void` | Called when the feedback form is closed. |
+| `onSubmitSuccess` | `(Feedback) -> Void` | Called when feedback is successfully submitted via the prepared form. |
+| `onSubmitError` | `(Feedback) -> Void` | Called when there is an error submitting feedback via the prepared form. |
+
+`onSubmitSuccess` and `onSubmitError` forward the feedback object that was submitted, which contains the following properties:
+
+- `message`: The message the user entered in the feedback form.
+- `name`: The name the user entered in the feedback form.
+- `contactEmail`: The email the user entered in the feedback form.
+
+Example:
+
+```java
+SentryAndroid.init(context, options -> {
+ options.getFeedbackOptions().setOnFormOpen(() -> System.out.println("Form opened"));
+ options.getFeedbackOptions().setOnFormClose(() -> System.out.println("Form closed"));
+ options.getFeedbackOptions().setOnSubmitSuccess((feedback) -> System.out.println("Feedback submitted successfully: " + feedback.toString()));
+ options.getFeedbackOptions().setOnSubmitError((feedback) -> System.out.println("Failed to submit feedback: " + feedback.toString()));
+});
+```
+```kotlin
+SentryAndroid.init(this) { options ->
+ options.feedbackOptions.onFormOpen = Runnable { println("Form opened") }
+ options.feedbackOptions.onFormClose = Runnable { println("Form closed") }
+ options.feedbackOptions.onSubmitSuccess = SentryFeedbackOptions.SentryFeedbackCallback {
+ println("Feedback submitted successfully: $it")
+ }
+ options.feedbackOptions.onSubmitError = SentryFeedbackOptions.SentryFeedbackCallback {
+ println("Failed to submit feedback: $it")
+ }
+}
+```
+
+### Form Configuration
+
+You can customize which form elements are shown, whether they are required, and even prefill some info, in `SentryOptions.SentryFeedbackOptions`:
+
+| Option | Type | Default | Description |
+| ----------------------------- | -------- | ---------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
+| `showBranding` | `Bool` | `true` | Displays the Sentry logo inside the form |
+| `isNameRequired` | `Bool` | `false` | Requires the name field on the feedback form to be filled in. |
+| `showName` | `Bool` | `true` | Displays the name field on the feedback form. Ignored if `isNameRequired` is `true`. |
+| `isEmailRequired` | `Bool` | `false` | Requires the email field on the feedback form to be filled in. |
+| `showEmail` | `Bool` | `true` | Displays the email field on the feedback form. Ignored if `isEmailRequired` is `true`. |
+| `useSentryUser` | `Bool` | `true` | Sets the `email` and `name` fields to the corresponding Sentry SDK user fields that were called with `SentrySDK.setUser`. |
+
+Example:
+
+```xml {filename:AndroidManifest.xml}
+
+
+
+
+
+
+
+
+```
+```java
+SentryAndroid.init(context, options -> {
+ options.getFeedbackOptions().setNameRequired(true);
+ options.getFeedbackOptions().setShowName(false);
+ options.getFeedbackOptions().setEmailRequired(true);
+ options.getFeedbackOptions().setShowEmail(false);
+ options.getFeedbackOptions().setUseSentryUser(false);
+ options.getFeedbackOptions().setShowBranding(false);
+});
+```
+```kotlin
+SentryAndroid.init(this) { options ->
+ options.feedbackOptions.isNameRequired = true
+ options.feedbackOptions.isShowName = false
+ options.feedbackOptions.isEmailRequired = true
+ options.feedbackOptions.isShowEmail = false
+ options.feedbackOptions.isUseSentryUser = false
+ options.feedbackOptions.isShowBranding = false
+}
+```
+
+### Form Labels Configuration
+
+You can customize tha labels and placeholders used in the form.
+Note: manifest options are not supported here, due to internationalization:
+
+| Option | Type | Default | Description |
+| ----------------------------- | -------- | ---------------------------------------- | ------------------------------------------------------------------------------------------------------------------------- |
+| `formTitle` | `String` | `"Report a Bug"` | The title of the feedback form. |
+| `messageLabel` | `String` | `"Description"` | The label of the feedback description input field. |
+| `messagePlaceholder` | `String` | `"What's the bug? What did you expect?"` | The placeholder in the feedback description input field. |
+| `isRequiredLabel` | `String` | `" (Required)"` | The text to attach to the title label for a required field. |
+| `successMessageText` | `String` | `"Thank you for your report!"` | The message displayed after a successful feedback submission. |
+| `nameLabel` | `String` | `"Name"` | The label next to the name input field. |
+| `namePlaceholder` | `String` | `"Your Name"` | The placeholder in the name input field. |
+| `emailLabel` | `String` | `"Email"` | The label next to the email input field. |
+| `emailPlaceholder` | `String` | `"your.email@example.org"` | The placeholder in the email input field. |
+| `submitButtonLabel` | `String` | `"Send Bug Report"` | The label of the submit button. |
+| `cancelButtonLabel` | `String` | `"Cancel"` | The label of the cancel button. |
+
+Example:
+
+```java
+SentryAndroid.init(context, options -> {
+ options.getFeedbackOptions().setFormTitle("We want to hear from you!");
+ options.getFeedbackOptions().setMessageLabel("Feedback");
+ options.getFeedbackOptions().setMessagePlaceholder("Type your feedback");
+ options.getFeedbackOptions().setIsRequiredLabel(" *");
+ options.getFeedbackOptions().setSuccessMessageText("Thanks for the feedback!");
+ options.getFeedbackOptions().setNameLabel("Full Name");
+ options.getFeedbackOptions().setNamePlaceholder("Type your full name");
+ options.getFeedbackOptions().setEmailLabel("Email Address");
+ options.getFeedbackOptions().setEmailPlaceholder("Type your email");
+ options.getFeedbackOptions().setSubmitButtonLabel("Submit");
+ options.getFeedbackOptions().setCancelButtonLabel("Back");
+});
+```
+```kotlin
+SentryAndroid.init(this) { options ->
+ options.feedbackOptions.formTitle = "We want to hear from you!"
+ options.feedbackOptions.messageLabel = "Feedback"
+ options.feedbackOptions.messagePlaceholder = "Type your feedback"
+ options.feedbackOptions.isRequiredLabel = " *"
+ options.feedbackOptions.successMessageText = "Thanks for the feedback!"
+ options.feedbackOptions.nameLabel = "Full Name"
+ options.feedbackOptions.namePlaceholder = "Type your full name"
+ options.feedbackOptions.emailLabel = "Email Address"
+ options.feedbackOptions.emailPlaceholder = "Type your email"
+ options.feedbackOptions.submitButtonLabel = "Submit"
+ options.feedbackOptions.cancelButtonLabel = "Back"
+}
+```
+
+### Theme Customization
+
+The User Feedback form integrates with the app theme by default, and can be customized with a custom xml style.
+Here are the attributes used by the form:
+
+| Android style attribute | Description |
+| --------------------------------- | ----------------------------------------------------------- |
+| `android:windowTitleStyle` | Style of the feedback dialog title |
+| `android:textColor` | Color of title, cancel button text, and non-editable texts. |
+| `android:editTextColor` | Color of editable texts. |
+| `android:textColorHint` | Color of the hint of editable texts. |
+| `android:textColorPrimaryInverse` | Color of the send button text. |
+| `android:colorPrimary` | Background color of the send button. |
+| `android:colorBackground` | Background color of the cancel button. |
+| `android:colorForeground` | Color tint of the image logo. |
+
+The theme used by the form is the one set in the application theme as the `android:dialogTheme`.
+Since the SentryUserFeedbackDialog extends AlertDialog, a custom theme can be also set when instantiating it:
+
+```java
+SentryUserFeedbackDialog dialog = new SentryUserFeedbackDialog(context, R.style.MyAppDialogTheme);
+```
+```kotlin
+val dialog = SentryUserFeedbackDialog(context, R.style.MyAppDialogTheme)
+```
+
+Here is an example of how the feedback form can be customized:
+
+```xml {filename:styles.xml}
+
+
+
+
+
+
+
+```
+
+### Bring Your Own Widget
+
+You can also use your own UI components to gather feedback and pass the feedback data object to the `Sentry.captureFeedback(Feedback)` function.
+
+```java
+import io.sentry.Sentry;
+import io.sentry.protocol.Feedback;
+
+Feedback feedback = new Feedback("I encountered a bug while using the app.");
+feedback.setName("John Doe");
+feedback.setContactEmail("john.doe@example.com");
+Sentry.captureFeedback(feedback);
+```
+```kotlin
+import io.sentry.Sentry
+import io.sentry.protocol.Feedback
+
+val feedback = Feedback("I encountered a bug while using the app.")
+feedback.name = "John Doe"
+feedback.contactEmail = "john.doe@example.com"
+Sentry.captureFeedback(feedback)
+```
diff --git a/docs/platforms/android/user-feedback/index.mdx b/docs/platforms/android/user-feedback/index.mdx
index d5eab7e5aefead..3479946a537622 100644
--- a/docs/platforms/android/user-feedback/index.mdx
+++ b/docs/platforms/android/user-feedback/index.mdx
@@ -1,16 +1,63 @@
---
title: Set Up User Feedback
sidebar_title: User Feedback
-description: "Learn more about collecting user feedback when an event occurs. Sentry pairs the feedback with the original event, giving you additional insight into issues."
+description: "Learn how to enable User Feedback in your Android app."
sidebar_order: 6000
---
-When a user experiences an error, Sentry provides the ability to collect additional feedback. You can collect feedback according to the method supported by the SDK.
+The User Feedback feature allows you to collect user feedback from anywhere inside your application at any time, without needing an error event to occur first.
+
+
+If you're using a self-hosted Sentry instance, you'll need to be on version 24.4.2 or higher in order to use the full functionality of the User Feedback feature. Lower versions may have limited functionality.
+Ensure you are using the Android SDK version 8.13.0 or above of the SDK to access the latest features.
+
+
+## User Feedback Widget
+
+The User Feedback widget allows users to submit feedback from anywhere inside your application.
+
+### Set Up
+
+To start using the User Feedback widget in your Android application, just start the SDK.
+A `SentryUserFeedbackDialog` will be available to be used in your app.
+For the configuration options, please refer to the User Feedback Widget Configuration.
+
+```java
+import io.sentry.android.core.SentryUserFeedbackDialog;
+
+// Just instantiate the dialog and show it whenever you want
+new SentryUserFeedbackDialog(context).show();
+```
+```kotlin
+import io.sentry.android.core.SentryUserFeedbackDialog
+
+// Just instantiate the dialog and show it whenever you want
+SentryUserFeedbackDialog(context).show()
+```
+
+### Session Replay
+
+The User Feedback widget integrates seamlessly with Session Replay. When the widget is opened, the SDK buffers up to 30 seconds of the user's session. If feedback is submitted, this replay is sent along with the feedback, allowing you to view both the feedback and the user's actions leading up to the feedback submission.
## User Feedback API
-The user feedback API allows you to collect user feedback while utilizing your own UI. You can use the same programming language you have in your app to send user feedback. In this case, the SDK creates the HTTP request so you don't have to deal with posting data via HTTP.
+The User Feedback API allows you to collect user feedback while using your own UI components. You can submit feedback directly using the `Sentry.captureFeedback(Feedback)` method:
+
+```java
+import io.sentry.Sentry;
+import io.sentry.protocol.Feedback;
-Sentry pairs the feedback with the original event, giving you additional insight into issues. Sentry needs the `eventId` to be able to associate the user feedback to the corresponding event. For example, to get the `eventId`, you can use or the return value of the method capturing an event.
+Feedback feedback = new Feedback("I encountered a bug while using the app.");
+feedback.setName("John Doe");
+feedback.setContactEmail("john.doe@example.com");
+Sentry.captureFeedback(feedback);
+```
+```kotlin
+import io.sentry.Sentry
+import io.sentry.protocol.Feedback
-
+val feedback = Feedback("I encountered a bug while using the app.")
+feedback.name = "John Doe"
+feedback.contactEmail = "john.doe@example.com"
+Sentry.captureFeedback(feedback)
+```