diff options
| author |   Tadashi G. Takaoka <takaoka@google.com> | 2014-01-27 23:53:32 -0800 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2014-01-27 23:53:32 -0800 |
| commit | a15565eca6292ffc96103ec6eb4b99338f525590 (patch) | |
| tree | b6486953310e1c39343dc1574382a0b34f4d8f72 /java/res/layout | |
| parent | 927437177dc643f78271bc8910d7a6d059aa92c4 (diff) | |
| parent | 95e5e267ac1aca7c5a7db2ceea96716437c6b2fe (diff) | |
| download | latinime-a15565eca6292ffc96103ec6eb4b99338f525590.tar.gz latinime-a15565eca6292ffc96103ec6eb4b99338f525590.tar.xz latinime-a15565eca6292ffc96103ec6eb4b99338f525590.zip | |
am 95e5e267: Merge "Suggestion strip honors RTL layout"
* commit '95e5e267ac1aca7c5a7db2ceea96716437c6b2fe':
Suggestion strip honors RTL layout
Diffstat (limited to 'java/res/layout')
| -rw-r--r-- | java/res/layout/hint_add_to_dictionary.xml | 36 | ||||
| -rw-r--r-- | java/res/layout/suggestions_strip.xml | 2 |
2 files changed, 1 insertions, 37 deletions
diff --git a/java/res/layout/hint_add_to_dictionary.xml b/java/res/layout/hint_add_to_dictionary.xml deleted file mode 100644 index d42908260..000000000 --- a/java/res/layout/hint_add_to_dictionary.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- -/* -** -** Copyright 2012, The Android Open Source Project -** -** Licensed under the Apache License, Version 2.0 (the "License"); -** you may not use this file except in compliance with the License. -** You may obtain a copy of the License at -** -** http://www.apache.org/licenses/LICENSE-2.0 -** -** Unless required by applicable law or agreed to in writing, software -** distributed under the License is distributed on an "AS IS" BASIS, -** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -** See the License for the specific language governing permissions and -** limitations under the License. -*/ ---> - -<!-- This is derived from suggestion_word.xml without minWidth attribute and padding --> -<TextView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:textSize="@dimen/config_suggestion_text_size" - android:gravity="center" - android:paddingLeft="0dp" - android:paddingTop="0dp" - android:paddingRight="0dp" - android:paddingBottom="0dp" - android:focusable="false" - android:clickable="false" - android:singleLine="true" - android:ellipsize="none" - style="?attr/suggestionWordStyle" /> diff --git a/java/res/layout/suggestions_strip.xml b/java/res/layout/suggestions_strip.xml index 2ffac179c..85d60e681 100644 --- a/java/res/layout/suggestions_strip.xml +++ b/java/res/layout/suggestions_strip.xml @@ -37,7 +37,7 @@ <include layout="@layout/suggestion_divider" /> <include - layout="@layout/hint_add_to_dictionary" + layout="@layout/suggestion_word" android:id="@+id/hint_add_to_dictionary" /> </LinearLayout> </merge> |