diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-05-23 16:44:50 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-05-23 16:44:50 +0000 |
| commit | cf4884c5a79e9260a82e7d4ed0eac264f987c230 (patch) | |
| tree | 6843928b2e0ec6565d5e9ffa5da7c7532b990a2f /java/res/layout | |
| parent | c35706af3185863440102fa098d515026310a6a4 (diff) | |
| parent | e3bfb825f558c6e46f75c11cbbe0b25ae36063ee (diff) | |
| download | latinime-cf4884c5a79e9260a82e7d4ed0eac264f987c230.tar.gz latinime-cf4884c5a79e9260a82e7d4ed0eac264f987c230.tar.xz latinime-cf4884c5a79e9260a82e7d4ed0eac264f987c230.zip | |
am e3bfb825: Merge "Consolidate attributes to EmojiPaletteView to control indicators"
* commit 'e3bfb825f558c6e46f75c11cbbe0b25ae36063ee':
Consolidate attributes to EmojiPaletteView to control indicators
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/emoji_palettes_view.xml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml index e2933f96f..68fd37261 100644 --- a/java/res/layout/emoji_palettes_view.xml +++ b/java/res/layout/emoji_palettes_view.xml @@ -41,9 +41,7 @@ android:id="@android:id/tabs" android:layout_width="match_parent" android:layout_height="match_parent" - android:divider="@null" - android:tabStripEnabled="true" - style="?attr/emojiTabWidgetStyle" /> + android:divider="@null" /> <FrameLayout android:id="@android:id/tabcontent" android:layout_width="0dip" @@ -77,8 +75,7 @@ <com.android.inputmethod.keyboard.emoji.EmojiCategoryPageIndicatorView android:id="@+id/emoji_category_page_id_view" android:layout_width="match_parent" - android:layout_height="2dip" - style="?attr/emojiCategoryPageIndicatorViewStyle" /> + android:layout_height="2dip" /> <LinearLayout android:id="@+id/emoji_action_bar" android:orientation="horizontal" |