Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2015-07-06 16:43:42 +02:00
commit 7467f93883
2 changed files with 5 additions and 0 deletions

View file

@ -27,6 +27,9 @@
android:id="@+id/SearchText" android:id="@+id/SearchText"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="1"
android:singleLine="true"
android:lines="1"
android:layout_weight="1"/> android:layout_weight="1"/>
<Button <Button

View file

@ -36,6 +36,8 @@
android:layout_marginRight="@dimen/list_content_padding" android:layout_marginRight="@dimen/list_content_padding"
android:layout_weight="1" android:layout_weight="1"
android:maxLines="1" android:maxLines="1"
android:singleLine="true"
android:lines="1"
android:nextFocusLeft="@id/edit" android:nextFocusLeft="@id/edit"
android:nextFocusUp="@id/edit" android:nextFocusUp="@id/edit"
android:textColor="?android:textColorPrimary" android:textColor="?android:textColorPrimary"