Skip to content

Commit 4e5ad3a

Browse files
committed
merged main
renamed asset files to sentry_...
1 parent 67cbc0d commit 4e5ad3a

File tree

5 files changed

+3
-18
lines changed

5 files changed

+3
-18
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,15 +68,15 @@ private void init(
6868

6969
// If the drawable start is not set, set it to the default drawable
7070
if (drawableStart == -1) {
71-
setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.baseline_campaign_24, 0, 0, 0);
71+
setCompoundDrawablesRelativeWithIntrinsicBounds(R.drawable.sentry_campaign_24, 0, 0, 0);
7272
}
7373

7474
// Set the text all caps
7575
setAllCaps(textAllCaps);
7676

7777
// If the background is not set, set it to the default background
7878
if (background == -1) {
79-
setBackgroundResource(R.drawable.oval_button_ripple_background);
79+
setBackgroundResource(R.drawable.sentry_oval_button_ripple_background);
8080
}
8181

8282
// If the padding is not set, set it to 12dp

sentry-android-core/src/main/res/drawable/edit_text_border.xml

Lines changed: 0 additions & 15 deletions
This file was deleted.

sentry-android-core/src/main/res/drawable/baseline_campaign_24.xml renamed to sentry-android-core/src/main/res/drawable/sentry_campaign_24.xml

File renamed without changes.

sentry-android-core/src/main/res/drawable/oval_button_ripple_background.xml renamed to sentry-android-core/src/main/res/drawable/sentry_oval_button_ripple_background.xml

File renamed without changes.

sentry-android-integration-tests/sentry-uitest-android/src/androidTest/java/io/sentry/uitest/android/UserFeedbackUiTest.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -541,7 +541,7 @@ class UserFeedbackUiTest : BaseUiTest() {
541541

542542
assertFalse(widget.isAllCaps)
543543

544-
assertEquals(R.drawable.oval_button_ripple_background, widget.getProperty<Int>("mBackgroundResource"))
544+
assertEquals(R.drawable.sentry_oval_button_ripple_background, widget.getProperty<Int>("mBackgroundResource"))
545545

546546
assertEquals((densityScale * 12).toInt(), widget.paddingStart)
547547
assertEquals((densityScale * 12).toInt(), widget.paddingEnd)

0 commit comments

Comments
 (0)