Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'sherlock' of github.com:n8fr8/Gibberbot into sherlock

  • Loading branch information...
commit b3ffc7706f1afe7d30155836b9a32b38c97500a2 2 parents 46c81c5 + 5580d16
@devrandom authored
Showing with 6 additions and 5 deletions.
  1. +4 −3 res/layout/chat_view.xml
  2. +2 −2 res/menu/contact_list_menu.xml
View
7 res/layout/chat_view.xml
@@ -42,8 +42,9 @@
android:src="@drawable/ic_im_message_not_sent" />
<TextView android:id="@+id/warningText"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_height="fill_parent"
+ android:layout_weight="1"
android:paddingLeft="5dip"
android:textColor="#aaff0000"
android:text="@string/disconnected_warning"
@@ -51,7 +52,7 @@
/>
<ImageView android:id="@+id/deliveryIcon"
- android:layout_marginRight="3dip"
+ android:layout_margin="3dip"
android:layout_width="16dip"
android:layout_height="16dip"
android:scaleType="fitCenter"
View
4 res/menu/contact_list_menu.xml
@@ -38,7 +38,7 @@
<!--
<item android:id="@+id/menu_view_accounts"
android:title="@string/menu_view_accounts" />
--->
+
<item android:id="@+id/action_search"
android:title="@string/menu_search_contacts"
@@ -47,7 +47,7 @@
android:actionViewClass="android.widget.SearchView"
/>
-
+ -->
<item android:id="@+id/menu_view_groups"
android:title="@string/menu_view_groups"
Please sign in to comment.
Something went wrong with that request. Please try again.