Skip to content

Commit e5ca886

Browse files
committed
fix(feedback-widget): Do not redefine system resources
1 parent 1528dfb commit e5ca886

File tree

2 files changed

+19
-7
lines changed
  • sentry-android-core/src/main/res/values
  • sentry-android-integration-tests/sentry-uitest-android/src/main/res/values

2 files changed

+19
-7
lines changed
Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3+
<!-- We have to omit 'format' here as we're referencing the system attributes from the '@android:' namespace -->
34
<declare-styleable name="SentryUserFeedbackButton" >
4-
<attr name="android:drawableStart" format="reference" />
5-
<attr name="android:drawablePadding" format="dimension" />
6-
<attr name="android:padding" format="dimension" />
7-
<attr name="android:textAllCaps" format="boolean" />
8-
<attr name="android:background" format="reference|color" />
9-
<attr name="android:textColor" format="reference|color" />
10-
<attr name="android:text" format="string" />
5+
<attr name="android:drawableStart" />
6+
<attr name="android:drawablePadding" />
7+
<attr name="android:padding" />
8+
<attr name="android:textAllCaps" />
9+
<attr name="android:background" />
10+
<attr name="android:textColor" />
11+
<attr name="android:text" />
1112
</declare-styleable>
1213
</resources>
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources xmlns:tools="http://schemas.android.com/tools">
3+
<!-- Just a dummy styleable to verify resource merging -->
4+
<declare-styleable name="DummyStyle" >
5+
<attr name="android:drawableStart" format="reference" />
6+
<attr name="android:drawablePadding" format="dimension" />
7+
<attr name="android:padding" format="dimension" />
8+
<attr name="android:textAllCaps" format="boolean" />
9+
<attr name="android:background" format="reference|color" />
10+
<attr name="android:textColor" format="reference|color" />
11+
<attr name="android:text" format="string" />
12+
</declare-styleable>
13+
314
<bool tools:ignore="UnusedResources" name="leak_canary_allow_in_non_debuggable_build">true</bool>
415
</resources>

0 commit comments

Comments
 (0)