diff options
| author | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2015-02-20 22:19:31 +0100 |
| commit | 20eae3955700341188bc1907a506970f5817a153 (patch) | |
| tree | 6e50d9083a4392875b5f9dbe92b38973cf95c332 /src/main/res/layout/actionview_search.xml | |
| parent | 980a84a6ce4358e8662addf203695e01d9f931dc (diff) | |
| parent | ecbceae88b7a7aa871e5396efec1e2ff8d056d46 (diff) | |
Merge master-origin
Conflicts:
src/main/java/eu/siacs/conversations/ui/SettingsActivity.java
src/main/java/eu/siacs/conversations/ui/XmppActivity.java
src/main/java/eu/siacs/conversations/ui/adapter/ConversationAdapter.java
src/main/java/eu/siacs/conversations/ui/adapter/MessageAdapter.java
src/main/java/eu/siacs/conversations/utils/UIHelper.java
src/main/res/values-de/strings.xml
Diffstat (limited to 'src/main/res/layout/actionview_search.xml')
| -rw-r--r-- | src/main/res/layout/actionview_search.xml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/main/res/layout/actionview_search.xml b/src/main/res/layout/actionview_search.xml index 64b75f0e..cc5fc9d7 100644 --- a/src/main/res/layout/actionview_search.xml +++ b/src/main/res/layout/actionview_search.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="fill_parent" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" android:layout_height="wrap_content" android:addStatesFromChildren="true" android:focusable="true" @@ -10,10 +10,10 @@ <EditText android:id="@+id/search_field" - android:layout_width="fill_parent" + android:layout_width="match_parent" android:layout_height="wrap_content" android:focusable="true" android:inputType="textEmailAddress|textNoSuggestions" android:textColor="@color/ondarktext" /> -</LinearLayout>
\ No newline at end of file +</RelativeLayout>
\ No newline at end of file |