ADHOC/replicant-packages_apps_Email
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Added a label to Exchange device ID."

Browse Source
This commit is contained in:
Makoto Onuki 2010-05-17 14:37:25 -07:00 committed by Android (Google) Code Review
commit b1151244ca
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
res/layout/account_setup_exchange.xml
View File

@ -78,15 +78,17 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:text="@string/account_setup_exchange_trust_certificates_label" /> android:text="@string/account_setup_exchange_trust_certificates_label" />
<TextView
android:text="@string/account_setup_exchange_device_id_label"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:textColor="?android:attr/textColorPrimary" />
<TextView <TextView
android:id="@+id/device_id" android:id="@+id/device_id"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:paddingTop="5dip" android:textAppearance="?android:attr/textAppearanceMedium"
android:paddingBottom="5dip" android:textColor="#ffbebebe" />
android:paddingLeft="3dip"
android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorTertiary" />
</LinearLayout> </LinearLayout>
<RelativeLayout <RelativeLayout

2
res/values/strings.xml
View File

@ -444,6 +444,8 @@
<string name="account_setup_exchange_ssl_label">Use secure connection (SSL)</string> <string name="account_setup_exchange_ssl_label">Use secure connection (SSL)</string>
<!-- On "Exchange" setup screen, the trust ssl certificates checkbox label --> <!-- On "Exchange" setup screen, the trust ssl certificates checkbox label -->
<string name="account_setup_exchange_trust_certificates_label">Accept all SSL certificates</string> <string name="account_setup_exchange_trust_certificates_label">Accept all SSL certificates</string>
<!-- On "Exchange" setup screen, the exchange device-id label -->
<string name="account_setup_exchange_device_id_label">Moblile Device ID</string>
<!-- In Account setup options screen, Activity title --> <!-- In Account setup options screen, Activity title -->
<string name="account_setup_options_title">Account options</string> <string name="account_setup_options_title">Account options</string>