aboutsummaryrefslogtreecommitdiffstats
path: root/java/res/layout
diff options
context:
space:
mode:
authorTadashi G. Takaoka <takaoka@google.com>2014-05-23 16:42:49 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-05-23 16:42:50 +0000
commite3bfb825f558c6e46f75c11cbbe0b25ae36063ee (patch)
tree6843928b2e0ec6565d5e9ffa5da7c7532b990a2f /java/res/layout
parente782f1f4154690da356fac6939ded66b5f66864d (diff)
parent2782f9792708148e4481aa41912239500825d819 (diff)
downloadlatinime-e3bfb825f558c6e46f75c11cbbe0b25ae36063ee.tar.gz
latinime-e3bfb825f558c6e46f75c11cbbe0b25ae36063ee.tar.xz
latinime-e3bfb825f558c6e46f75c11cbbe0b25ae36063ee.zip
Merge "Consolidate attributes to EmojiPaletteView to control indicators"
Diffstat (limited to 'java/res/layout')
-rw-r--r--java/res/layout/emoji_palettes_view.xml7
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"