Fix some errors for Settings project
Attrs could not have same name, so create a common parent for the messageText. And BiometricEnrollCheckbox is not in use. Replace some com.android.settingslib.R with com.android.settings.R, because these are files in settings instead of settingslib. Bug: 253772249 Test: TAP Change-Id: Ifa796e923bf26facf4935be4968637affdb4b48b
This commit is contained in:
@@ -93,10 +93,14 @@
|
||||
<attr name="currentPageIndicatorColor" format="color" />
|
||||
</declare-styleable>
|
||||
|
||||
<!-- For ConversationMessageView -->
|
||||
<declare-styleable name="ConversationMessageView">
|
||||
<attr name="incoming" format="boolean" />
|
||||
<declare-styleable name="MessageView">
|
||||
<attr name="messageText" format="reference" />
|
||||
</declare-styleable>
|
||||
|
||||
<!-- For ConversationMessageView -->
|
||||
<declare-styleable name="ConversationMessageView" parent="MessageView">
|
||||
<attr name="incoming" format="boolean" />
|
||||
<attr name="messageText" />
|
||||
<attr name="timestampText" format="reference" />
|
||||
<attr name="iconText" format="reference" />
|
||||
<attr name="iconTextColor" format="reference|color" />
|
||||
@@ -146,16 +150,9 @@
|
||||
<attr name="android:gravity" />
|
||||
</declare-styleable>
|
||||
|
||||
<!-- For biometric enroll checkboxes -->
|
||||
<declare-styleable name="BiometricEnrollCheckbox">
|
||||
<attr name="icon" format="reference" />
|
||||
<attr name="title" format="reference" />
|
||||
<attr name="description" format="reference" />
|
||||
</declare-styleable>
|
||||
|
||||
<!-- For Face enroll accessibility toggle -->
|
||||
<declare-styleable name="FaceEnrollAccessibilityToggle">
|
||||
<attr name="messageText" format="reference" />
|
||||
<declare-styleable name="FaceEnrollAccessibilityToggle" parent="MessageView">
|
||||
<attr name="messageText" />
|
||||
</declare-styleable>
|
||||
|
||||
<!-- For TwoStatesButtonPreference -->
|
||||
|
||||
Reference in New Issue
Block a user