Consolidate attributes to EmojiPaletteView to control indicators
This CL consolidates attributes of EmojiTabWidget and
EmojiCategoryPageIndicatorView with EmojiPaletteView.
Bug: 15151483
Change-Id: I6eca10b60e894d945080ef3f88523d539a4992fa
diff --git a/java/res/values/attrs.xml b/java/res/values/attrs.xml
index 307ef13..775a90c 100644
--- a/java/res/values/attrs.xml
+++ b/java/res/values/attrs.xml
@@ -30,10 +30,6 @@
<attr name="keyPreviewTextViewStyle" format="reference"/>
<!-- EmojiPalettesView style -->
<attr name="emojiPalettesViewStyle" format="reference" />
- <!-- TabWidget of EmojiPlettesView style -->
- <attr name="emojiTabWidgetStyle" format="reference" />
- <!-- EmojiCategoryPageIndicatorView style -->
- <attr name="emojiCategoryPageIndicatorViewStyle" format="reference" />
<!-- MoreKeysKeyboard style -->
<attr name="moreKeysKeyboardStyle" format="reference" />
<!-- MoreKeysKeyboardView style -->
@@ -176,6 +172,11 @@
</declare-styleable>
<declare-styleable name="EmojiPalettesView">
+ <attr name="categoryIndicatorEnabled" format="boolean" />
+ <attr name="categoryIndicatorDrawable" format="reference" />
+ <attr name="categoryIndicatorBackground" format="reference" />
+ <attr name="categoryPageIndicatorColor" format="color" />
+ <attr name="categoryPageIndicatorBackground" format="color" />
<attr name="iconEmojiRecentsTab" format="reference" />
<attr name="iconEmojiCategory1Tab" format="reference" />
<attr name="iconEmojiCategory2Tab" format="reference" />
@@ -185,10 +186,6 @@
<attr name="iconEmojiCategory6Tab" format="reference" />
</declare-styleable>
- <declare-styleable name="EmojiCategoryPageIndicatorView">
- <attr name="emojiCategoryPageIndicatorColor" format="color" />
- </declare-styleable>
-
<declare-styleable name="SuggestionStripView">
<attr name="suggestionStripOptions" format="integer">
<!-- This should be aligned with SuggestionStripLayoutHelper.AUTO_CORRECT_* and etc. -->