diff options
| author |   Satoshi Kataoka <satok@google.com> | 2013-05-15 11:04:59 -0700 |
|---|---|---|
| committer |   Android Git Automerger <android-git-automerger@android.com> | 2013-05-15 11:04:59 -0700 |
| commit | 685b65580b5285f089a3bef622ab0888f44199f9 (patch) | |
| tree | 7242f4ce43530c9c2c89325a2983a37384eeb23d /java/res | |
| parent | e681b528225340578f31b0cf2577e4d15f456d5d (diff) | |
| parent | 75a6a525e9a34befd931fe666ee761625e6ead99 (diff) | |
| download | latinime-685b65580b5285f089a3bef622ab0888f44199f9.tar.gz latinime-685b65580b5285f089a3bef622ab0888f44199f9.tar.xz latinime-685b65580b5285f089a3bef622ab0888f44199f9.zip | |
am 75a6a525: am adbafa1a: Merge "Support ICS on the user dictionary settings"
* commit '75a6a525e9a34befd931fe666ee761625e6ead99':
Support ICS on the user dictionary settings
Diffstat (limited to 'java/res')
| -rw-r--r-- | java/res/layout/user_dictionary_item.xml | 61 |
1 files changed, 30 insertions, 31 deletions
diff --git a/java/res/layout/user_dictionary_item.xml b/java/res/layout/user_dictionary_item.xml index 3062ed89a..56bad7743 100644 --- a/java/res/layout/user_dictionary_item.xml +++ b/java/res/layout/user_dictionary_item.xml @@ -13,40 +13,39 @@ See the License for the specific language governing permissions and limitations under the License. --> - <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" - android:minHeight="?android:attr/listPreferredItemHeight" + android:background="?android:attr/selectableItemBackground" android:gravity="center_vertical" - android:paddingEnd="?android:attr/scrollbarSize" - android:background="?android:attr/selectableItemBackground" > - - <RelativeLayout android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginStart="15dip" - android:layout_marginEnd="6dip" - android:layout_marginTop="6dip" - android:layout_marginBottom="6dip" - android:layout_weight="1"> - - <TextView android:id="@+android:id/text1" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceMedium" - android:ellipsize="marquee" - android:fadingEdge="horizontal" /> - - <TextView android:id="@+android:id/text2" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_below="@android:id/text1" - android:layout_alignStart="@android:id/text1" - android:textAppearance="?android:attr/textAppearanceSmall" - android:textColor="?android:attr/textColorSecondary" - android:maxLines="1" /> - - </RelativeLayout> + android:minHeight="?android:attr/listPreferredItemHeight" + android:paddingEnd="?android:attr/scrollbarSize" > + + <RelativeLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:padding="6dip" + android:layout_weight="1" > + + <TextView + android:id="@+android:id/text1" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:ellipsize="marquee" + android:fadingEdge="horizontal" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+android:id/text2" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignStart="@android:id/text1" + android:layout_below="@android:id/text1" + android:maxLines="1" + android:textAppearance="?android:attr/textAppearanceSmall" + android:textColor="?android:attr/textColorSecondary" + android:visibility="gone" /> + </RelativeLayout> </LinearLayout> |