am bc48d181: Merge change 7051 into donut

Merge commit 'bc48d181fa9b1c1b516e3e9ece81e82069594022'

* commit 'bc48d181fa9b1c1b516e3e9ece81e82069594022':
  Use appropriate input types for edit fields in Apn settings.
This commit is contained in:
Android (Google) Code Review
2009-07-14 10:21:27 -07:00
committed by The Android Open Source Project

View File

@@ -22,72 +22,84 @@
android:dialogTitle="@string/apn_name" android:dialogTitle="@string/apn_name"
android:key="apn_name" android:key="apn_name"
android:singleLine="true" android:singleLine="true"
android:inputType="textEmailAddress"
/> />
<EditTextPreference <EditTextPreference
android:title="@string/apn_apn" android:title="@string/apn_apn"
android:dialogTitle="@string/apn_apn" android:dialogTitle="@string/apn_apn"
android:key="apn_apn" android:key="apn_apn"
android:singleLine="true" android:singleLine="true"
android:inputType="textEmailAddress"
/> />
<EditTextPreference <EditTextPreference
android:title="@string/apn_http_proxy" android:title="@string/apn_http_proxy"
android:dialogTitle="@string/apn_http_proxy" android:dialogTitle="@string/apn_http_proxy"
android:key="apn_http_proxy" android:key="apn_http_proxy"
android:singleLine="true" android:singleLine="true"
android:inputType="textUri"
/> />
<EditTextPreference <EditTextPreference
android:title="@string/apn_http_port" android:title="@string/apn_http_port"
android:dialogTitle="@string/apn_http_port" android:dialogTitle="@string/apn_http_port"
android:key="apn_http_port" android:key="apn_http_port"
android:singleLine="true" android:singleLine="true"
android:inputType="number"
/> />
<EditTextPreference <EditTextPreference
android:title="@string/apn_user" android:title="@string/apn_user"
android:dialogTitle="@string/apn_user" android:dialogTitle="@string/apn_user"
android:key="apn_user" android:key="apn_user"
android:singleLine="true" android:singleLine="true"
android:inputType="textEmailAddress"
/> />
<EditTextPreference <EditTextPreference
android:title="@string/apn_password" android:title="@string/apn_password"
android:dialogTitle="@string/apn_password" android:dialogTitle="@string/apn_password"
android:key="apn_password" android:key="apn_password"
android:singleLine="true" android:singleLine="true"
android:inputType="textPassword"
/> />
<EditTextPreference <EditTextPreference
android:title="@string/apn_server" android:title="@string/apn_server"
android:dialogTitle="@string/apn_server" android:dialogTitle="@string/apn_server"
android:key="apn_server" android:key="apn_server"
android:singleLine="true" android:singleLine="true"
android:inputType="textUri"
/> />
<EditTextPreference <EditTextPreference
android:title="@string/apn_mmsc" android:title="@string/apn_mmsc"
android:dialogTitle="@string/apn_mmsc" android:dialogTitle="@string/apn_mmsc"
android:key="apn_mmsc" android:key="apn_mmsc"
android:singleLine="true" android:singleLine="true"
android:inputType="textUri"
/> />
<EditTextPreference <EditTextPreference
android:title="@string/apn_mms_proxy" android:title="@string/apn_mms_proxy"
android:dialogTitle="@string/apn_mms_proxy" android:dialogTitle="@string/apn_mms_proxy"
android:key="apn_mms_proxy" android:key="apn_mms_proxy"
android:singleLine="true" android:singleLine="true"
android:inputType="textUri"
/> />
<EditTextPreference <EditTextPreference
android:title="@string/apn_mms_port" android:title="@string/apn_mms_port"
android:dialogTitle="@string/apn_mms_port" android:dialogTitle="@string/apn_mms_port"
android:key="apn_mms_port" android:key="apn_mms_port"
android:singleLine="true" android:singleLine="true"
android:inputType="number"
/> />
<EditTextPreference <EditTextPreference
android:title="@string/apn_mcc" android:title="@string/apn_mcc"
android:dialogTitle="@string/apn_mcc" android:dialogTitle="@string/apn_mcc"
android:key="apn_mcc" android:key="apn_mcc"
android:singleLine="true" android:singleLine="true"
android:inputType="number"
/> />
<EditTextPreference <EditTextPreference
android:title="@string/apn_mnc" android:title="@string/apn_mnc"
android:dialogTitle="@string/apn_mnc" android:dialogTitle="@string/apn_mnc"
android:key="apn_mnc" android:key="apn_mnc"
android:singleLine="true" android:singleLine="true"
android:inputType="number"
/> />
<EditTextPreference <EditTextPreference
android:title="@string/apn_type" android:title="@string/apn_type"