equal
deleted
inserted
replaced
101 <CheckBox android:id="@+id/settings_xmpp_use_tls" |
101 <CheckBox android:id="@+id/settings_xmpp_use_tls" |
102 android:layout_width="wrap_content" |
102 android:layout_width="wrap_content" |
103 android:layout_height="wrap_content" |
103 android:layout_height="wrap_content" |
104 android:text="@string/settings_xmpp_use_tls" |
104 android:text="@string/settings_xmpp_use_tls" |
105 android:layout_below="@id/settings_xmpp_table_sp" |
105 android:layout_below="@id/settings_xmpp_table_sp" |
106 style="@style/Label" /> |
106 style="@style/CheckBoxLabel" /> |
107 <Button android:id="@+id/settings_xmpp_button_save" |
107 <Button android:id="@+id/settings_xmpp_button_save" |
108 android:layout_width="wrap_content" |
108 android:layout_width="wrap_content" |
109 android:layout_height="wrap_content" |
109 android:layout_height="wrap_content" |
110 android:layout_alignParentRight="true" |
110 android:layout_alignParentRight="true" |
111 android:layout_below="@id/settings_xmpp_use_tls" |
111 android:layout_below="@id/settings_xmpp_use_tls" |
127 android:padding="10dip"> |
127 android:padding="10dip"> |
128 <CheckBox android:id="@+id/settings_proxy_use" |
128 <CheckBox android:id="@+id/settings_proxy_use" |
129 android:layout_width="wrap_content" |
129 android:layout_width="wrap_content" |
130 android:layout_height="wrap_content" |
130 android:layout_height="wrap_content" |
131 android:text="@string/settings_proxy_use" |
131 android:text="@string/settings_proxy_use" |
132 style="@style/Label" /> |
132 style="@style/CheckBoxLabel" /> |
133 <LinearLayout android:id="@+id/settings_proxy_parameters" |
133 <LinearLayout android:id="@+id/settings_proxy_parameters" |
134 android:layout_width="fill_parent" |
134 android:layout_width="fill_parent" |
135 android:layout_height="fill_parent" |
135 android:layout_height="fill_parent" |
136 android:layout_below="@id/settings_proxy_use" |
136 android:layout_below="@id/settings_proxy_use" |
137 android:orientation="vertical"> |
137 android:orientation="vertical"> |