diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-07-09 22:37:37 +0000 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-07-09 22:37:37 +0000 |
| commit | 85ca5ed45a3be5b6dc31ecd166e45f6e740465a5 (patch) | |
| tree | 76937a992ca206e6a903fef8af5f4077676ce0f3 /java/res/layout | |
| parent | 757964ae46928536b3d19ef335147c10bd11050b (diff) | |
| parent | 8e7260a014f419744f3d1921b232b5efbd5d5086 (diff) | |
| download | latinime-85ca5ed45a3be5b6dc31ecd166e45f6e740465a5.tar.gz latinime-85ca5ed45a3be5b6dc31ecd166e45f6e740465a5.tar.xz latinime-85ca5ed45a3be5b6dc31ecd166e45f6e740465a5.zip | |
am 8e7260a0: Merge "Update Material Dark theme"
* commit '8e7260a014f419744f3d1921b232b5efbd5d5086':
Update Material Dark theme
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/emoji_palettes_view.xml | 6 | ||||
| -rw-r--r-- | java/res/layout/suggestion_divider.xml | 4 |
2 files changed, 4 insertions, 6 deletions
diff --git a/java/res/layout/emoji_palettes_view.xml b/java/res/layout/emoji_palettes_view.xml index 9ff090aad..a6ea38ba4 100644 --- a/java/res/layout/emoji_palettes_view.xml +++ b/java/res/layout/emoji_palettes_view.xml @@ -30,6 +30,7 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="@dimen/config_suggestions_strip_height" + style="?attr/suggestionStripViewStyle" > <TabHost android:id="@+id/emoji_category_tabhost" @@ -57,10 +58,7 @@ android:visibility="gone" /> </FrameLayout> </TabHost> - <View - android:layout_width="2dip" - android:layout_height="match_parent" - android:background="@drawable/suggestions_strip_divider" /> + <include layout="@layout/suggestion_divider" /> <!-- TODO: Implement KeyView and replace this. --> <!-- Provide audio and haptic feedback by ourselves based on the keyboard settings. We just need to ignore the system's audio and haptic feedback settings. --> diff --git a/java/res/layout/suggestion_divider.xml b/java/res/layout/suggestion_divider.xml index 563599d82..dfea017e6 100644 --- a/java/res/layout/suggestion_divider.xml +++ b/java/res/layout/suggestion_divider.xml @@ -26,9 +26,9 @@ android:layout_height="match_parent" android:padding="0dp" android:gravity="center" - android:src="@drawable/suggestions_strip_divider" android:contentDescription="@null" android:clickable="false" android:longClickable="false" android:hapticFeedbackEnabled="false" - android:soundEffectsEnabled="false" /> + android:soundEffectsEnabled="false" + style="?attr/suggestionStripViewStyle" /> |