Mercurial Mercurial > beem > otr / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
res/layout/edit_settings.xml
author Da Risk <darisk972@gmail.com>
Fri, 26 Jun 2009 19:45:07 +0200
changeset 319 517e80eedfd8
parent 230 21d91ef67e97
child 323 81fcc509bafc
permissions -rw-r--r--
UI improvements
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
212
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
     1
 
<?xml version="1.0" encoding="utf-8"?>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
     2
 
<TabHost android:id="@+id/settings_tab_host" xmlns:android="http://schemas.android.com/apk/res/android"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
     3
 
    android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
     4
 
	android:layout_height="fill_parent">
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
     5
 
	<LinearLayout
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
     6
 
		android:orientation="vertical"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
     7
 
    	android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
     8
 
    	android:layout_height="fill_parent">
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
     9
 
    	<TabWidget android:id="@android:id/tabs"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    10
 
    		android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    11
 
    		android:layout_height="wrap_content" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    12
 
    	<FrameLayout android:id="@android:id/tabcontent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    13
 
    		android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    14
 
    		android:layout_height="fill_parent">
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    15
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    16
 
    		<!--
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    17
 
    			Account Tab
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    18
 
    		-->
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    19
 
    		<ScrollView
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    20
 
    			android:orientation="vertical"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    21
 
    			android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    22
 
    			android:layout_height="fill_parent">
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    23
 
    		<RelativeLayout android:id="@+id/settings_account"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    24
 
    			android:orientation="vertical"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    25
 
    			android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    26
 
    			android:layout_height="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    27
 
    			android:padding="10dip">
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    28
 
    			<TextView android:id="@+id/settings_account_label_username"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    29
 
    				android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    30
 
    				android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    31
 
    				android:text="@string/settings_account_username"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    32
 
    				style="@style/Label" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    33
 
				<EditText android:id="@+id/settings_account_username"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    34
 
					android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    35
 
					android:layout_height="wrap_content"
230
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
    36
 
					android:layout_below="@id/settings_account_label_username"
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
    37
 
					android:singleLine="true" />
212
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    38
 
    			<TextView android:id="@+id/settings_account_label_password"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    39
 
    				android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    40
 
    				android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    41
 
					android:layout_below="@id/settings_account_username"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    42
 
    				android:text="@string/settings_account_password"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    43
 
    				style="@style/Label" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    44
 
				<EditText android:id="@+id/settings_account_password"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    45
 
					android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    46
 
					android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    47
 
					android:layout_below="@id/settings_account_label_password"
230
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
    48
 
					android:password="true"
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
    49
 
					android:singleLine="true" />
212
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    50
 
    			<Button android:id="@+id/settings_account_button_save"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    51
 
					android:layout_width="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    52
 
					android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    53
 
					android:layout_below="@id/settings_account_password"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    54
 
					android:layout_alignParentRight="true"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    55
 
					android:text="@string/button_save" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    56
 
    		</RelativeLayout>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    57
 
    		</ScrollView>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    58
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    59
 
    		<!--
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    60
 
    			XMPP Tab
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    61
 
    		-->
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    62
 
    		<ScrollView
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    63
 
    			android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    64
 
    			android:layout_height="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    65
 
    			android:orientation="vertical">
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    66
 
    		<RelativeLayout android:id="@+id/settings_xmpp"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    67
 
    			android:orientation="vertical"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    68
 
    			android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    69
 
    			android:layout_height="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    70
 
    			android:padding="10dip">
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    71
 
	  			<TableLayout android:id="@+id/settings_xmpp_table_sp"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    72
 
  					android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    73
 
  					android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    74
 
  					android:stretchColumns="1">
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    75
 
  					<TableRow>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    76
 
   						<TextView android:id="@+id/settings_xmpp_label_server"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    77
 
   							android:layout_column="1"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    78
 
  							android:layout_width="223dp"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    79
 
  							android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    80
 
  							android:text="@string/settings_xmpp_server"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    81
 
  							style="@style/Label" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    82
 
  						<TextView android:id="@+id/settings_xmpp_label_port"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    83
 
  							android:layout_column="2"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    84
 
  							android:layout_width="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    85
 
  							android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    86
 
  							android:text="@string/settings_xmpp_port"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    87
 
  							style="@style/Label" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    88
 
					</TableRow>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    89
 
					<TableRow>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    90
 
						<EditText android:id="@+id/settings_xmpp_server"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    91
 
							android:layout_column="1"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    92
 
							android:layout_width="wrap_content"
230
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
    93
 
							android:layout_height="wrap_content"
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
    94
 
							android:maxWidth="223dp"
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
    95
 
							android:singleLine="true" />
212
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    96
 
						<EditText android:id="@+id/settings_xmpp_port"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    97
 
							android:layout_column="2"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    98
 
							android:layout_width="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
    99
 
							android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   100
 
							android:minWidth="77dp"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   101
 
							android:numeric="integer"
230
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
   102
 
							android:maxLength="5"
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
   103
 
							android:singleLine="true" />
212
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   104
 
					</TableRow>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   105
 
				</TableLayout>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   106
 
    			<CheckBox android:id="@+id/settings_xmpp_use_tls"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   107
 
    				android:layout_width="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   108
 
    				android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   109
 
    				android:text="@string/settings_xmpp_use_tls"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   110
 
    				android:layout_below="@id/settings_xmpp_table_sp"
226
e19e8aba0dd2 Bug #163
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 212
diff changeset 
   111
 
    				style="@style/CheckBoxLabel" />
212
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   112
 
				<Button android:id="@+id/settings_xmpp_button_save"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   113
 
					android:layout_width="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   114
 
					android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   115
 
					android:layout_alignParentRight="true"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   116
 
					android:layout_below="@id/settings_xmpp_use_tls"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   117
 
					android:text="@string/button_save" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   118
 
    		</RelativeLayout>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   119
 
    		</ScrollView>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   120
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   121
 
    		<!--
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   122
 
    			Proxy Tab
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   123
 
    		-->
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   124
 
    		<ScrollView
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   125
 
    			android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   126
 
    			android:layout_height="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   127
 
    			android:orientation="vertical">
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   128
 
    		<RelativeLayout android:id="@+id/settings_proxy"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   129
 
    			android:orientation="vertical"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   130
 
    			android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   131
 
    			android:layout_height="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   132
 
    			android:padding="10dip">
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   133
 
    			<CheckBox android:id="@+id/settings_proxy_use"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   134
 
    				android:layout_width="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   135
 
    				android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   136
 
    				android:text="@string/settings_proxy_use"
319
517e80eedfd8 UI improvements
Da Risk <darisk972@gmail.com>
parents: 230
diff changeset 
   137
 
    				android:focusable="true"
226
e19e8aba0dd2 Bug #163
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 212
diff changeset 
   138
 
    				style="@style/CheckBoxLabel" />
212
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   139
 
    			<LinearLayout android:id="@+id/settings_proxy_parameters"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   140
 
    				android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   141
 
    				android:layout_height="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   142
 
    				android:layout_below="@id/settings_proxy_use"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   143
 
    				android:orientation="vertical">
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   144
 
    				<Spinner android:id="@+id/settings_proxy_type"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   145
 
    					android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   146
 
    					android:layout_height="wrap_content" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   147
 
    				<TableLayout android:id="@+id/settings_proxy_table_sp"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   148
 
    					android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   149
 
    					android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   150
 
    					android:stretchColumns="1">
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   151
 
    					<TableRow>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   152
 
     						<TextView android:id="@+id/settings_proxy_label_server"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   153
 
     							android:layout_column="1"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   154
 
    							android:layout_width="223dp"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   155
 
    							android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   156
 
    							android:text="@string/settings_proxy_server"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   157
 
    							style="@style/Label" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   158
 
    						<TextView android:id="@+id/settings_proxy_label_port"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   159
 
    							android:layout_column="2"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   160
 
    							android:layout_width="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   161
 
    							android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   162
 
    							android:text="@string/settings_proxy_port"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   163
 
    							style="@style/Label" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   164
 
						</TableRow>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   165
 
						<TableRow>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   166
 
							<EditText android:id="@+id/settings_proxy_server"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   167
 
								android:layout_column="1"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   168
 
								android:layout_width="wrap_content"
230
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
   169
 
								android:layout_height="wrap_content"
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
   170
 
    							android:maxWidth="223dp"
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
   171
 
								android:singleLine="true" />
212
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   172
 
							<EditText android:id="@+id/settings_proxy_port"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   173
 
								android:layout_column="2"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   174
 
								android:layout_width="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   175
 
								android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   176
 
								android:minWidth="77dp"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   177
 
								android:numeric="integer"
230
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
   178
 
								android:maxLength="5"
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
   179
 
								android:singleLine="true" />
212
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   180
 
						</TableRow>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   181
 
					</TableLayout>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   182
 
     				<TextView android:id="@+id/settings_proxy_label_username"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   183
 
    					android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   184
 
    					android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   185
 
    					android:text="@string/settings_proxy_username"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   186
 
    					style="@style/Label" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   187
 
					<EditText android:id="@+id/settings_proxy_username"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   188
 
						android:layout_width="fill_parent"
230
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
   189
 
						android:layout_height="wrap_content"
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
   190
 
						android:singleLine="true" />
212
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   191
 
     				<TextView android:id="@+id/settings_proxy_label_password"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   192
 
    					android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   193
 
    					android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   194
 
    					android:text="@string/settings_proxy_password"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   195
 
    					style="@style/Label" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   196
 
					<EditText android:id="@+id/settings_proxy_password"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   197
 
						android:layout_width="fill_parent"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   198
 
						android:layout_height="wrap_content"
230
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
   199
 
    					android:password="true"
21d91ef67e97 Bug #166 - Passage des différents EditText de l'activité Settings en SingleLine. Correction d'un bug poussant le champs Port en dehors de la zone de vue dans les tabs Proxy et XMPP.
dasilvj@jean-manuel-da-silvas-macbook.local
parents: 226
diff changeset 
   200
 
    					android:singleLine="true" />
212
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   201
 
				</LinearLayout>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   202
 
				<Button android:id="@+id/settings_proxy_button_save"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   203
 
					android:layout_width="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   204
 
					android:layout_height="wrap_content"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   205
 
					android:layout_alignParentRight="true"
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   206
 
					android:text="@string/button_save" />
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   207
 
    		</RelativeLayout>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   208
 
    		</ScrollView>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   209
 
    	</FrameLayout>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   210
 
	</LinearLayout>
bbc0b169cdf0 Issues #124, #67, #88
dasilvj
parents:
diff changeset 
   211
 
</TabHost>
BEEM-OTR