diff options
Diffstat (limited to 'core/res')
25 files changed, 279 insertions, 84 deletions
diff --git a/core/res/AndroidManifest.xml b/core/res/AndroidManifest.xml index 00d9cf6..027fb23 100644 --- a/core/res/AndroidManifest.xml +++ b/core/res/AndroidManifest.xml @@ -57,7 +57,7 @@ <!-- Permissions for things that cost money --> <!-- ====================================== --> <eat-comment /> - + <!-- Used for permissions that can be used to make the user spend money without their direct involvement. For example, this is the group for permissions that allow you to directly place phone calls, @@ -86,7 +86,7 @@ <!-- Permissions for accessing messages --> <!-- ================================== --> <eat-comment /> - + <!-- Used for permissions that allow an application to send messages on behalf of the user or intercept messages being received by the user. This is primarily intended for SMS/MMS messaging, such as @@ -136,7 +136,7 @@ <!-- Permissions for accessing personal info (contacts and calendar) --> <!-- =============================================================== --> <eat-comment /> - + <!-- Used for permissions that provide access to the user's private data, such as contacts, calendar events, e-mail messages, etc. This includes both reading and writing of this data (which should generally be @@ -190,8 +190,8 @@ android:description="@string/permdesc_writeCalendar" /> <!-- Allows an application to read the user dictionary. This should - really only be required by an IME, or a dictionary editor like - the Settings app. + really only be required by an IME, or a dictionary editor like + the Settings app. @hide Pending API council approval --> <permission android:name="android.permission.READ_USER_DICTIONARY" android:permissionGroup="android.permission-group.PERSONAL_INFO" @@ -227,7 +227,7 @@ <!-- Permissions for accessing location info --> <!-- ======================================= --> <eat-comment /> - + <!-- Used for permissions that allow access to the user's current location. --> <permission-group android:name="android.permission-group.LOCATION" @@ -272,7 +272,7 @@ <!-- Permissions for accessing networks --> <!-- ======================================= --> <eat-comment /> - + <!-- Used for permissions that provide access to networking services. The main permission here is internet access, but this is also an appropriate group for accessing or modifying any network configuration @@ -313,7 +313,7 @@ <!-- Permissions for accessing accounts --> <!-- ================================== --> <eat-comment /> - + <!-- Permissions for direct access to Google accounts. Note that while right now this is only used for Google accounts, we expect in the future to have a more general account management @@ -334,7 +334,7 @@ <!-- Permissions for accessing hardware --> <!-- ================================== --> <eat-comment /> - + <!-- Used for permissions that provide direct access to the hardware on the device. This includes audio, the camera, vibrator, etc. --> <permission-group android:name="android.permission-group.HARDWARE_CONTROLS" @@ -387,7 +387,7 @@ <!-- Permissions associated with telephony state --> <!-- =========================================== --> <eat-comment /> - + <!-- Used for permissions that are associated with accessing and modifyign telephony state: intercepting outgoing calls, reading and modifying the phone state. Note that @@ -441,7 +441,7 @@ <!-- Permissions for low-level system interaction --> <!-- ============================================ --> <eat-comment /> - + <!-- Group of permissions that are related to system APIs. Many of these are not permissions the user will be expected to understand, and such permissions should generally be marked as "normal" protection @@ -665,7 +665,7 @@ android:description="@string/permdesc_writeApnSettings" android:label="@string/permlab_writeApnSettings" /> - <!-- Allows an application to allow access the subscribed feeds + <!-- Allows an application to allow access the subscribed feeds ContentProvider. --> <permission android:name="android.permission.SUBSCRIBED_FEEDS_READ" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" @@ -677,7 +677,7 @@ android:label="@string/permlab_subscribedFeedsWrite" android:description="@string/permdesc_subscribedFeedsWrite" android:protectionLevel="dangerous" /> - + <!-- Allows applications to change network connectivity state --> <permission android:name="android.permission.CHANGE_NETWORK_STATE" android:permissionGroup="android.permission-group.SYSTEM_TOOLS" @@ -728,7 +728,7 @@ <!-- Permissions for special development tools --> <!-- ========================================= --> <eat-comment /> - + <!-- Group of permissions that are related to development features. These are not permissions that should appear in normal applications; they protect APIs that are intended only to be used for development @@ -1088,6 +1088,11 @@ android:excludeFromRecents="true"> </activity> + <activity android:name="android.accounts.ChooseAccountActivity" + android:excludeFromRecents="true" + android:exported="true"> + </activity> + <service android:name="com.android.server.LoadAverageService" android:exported="true" /> @@ -1100,7 +1105,7 @@ <receiver android:name="com.android.server.MasterClearReceiver" android:permission="android.permission.MASTER_CLEAR" > <intent-filter> - <action android:name="android.intent.action.GTALK_DATA_MESSAGE_RECEIVED" /> + <action android:name="android.intent.action.REMOTE_INTENT" /> <category android:name="android.intent.category.MASTER_CLEAR" /> </intent-filter> </receiver> diff --git a/core/res/res/drawable/stat_sys_signal_flightmode.png b/core/res/res/drawable/stat_sys_signal_flightmode.png Binary files differindex 2f4fd4f..2f4fd4f 100644..100755 --- a/core/res/res/drawable/stat_sys_signal_flightmode.png +++ b/core/res/res/drawable/stat_sys_signal_flightmode.png diff --git a/core/res/res/values-cs/strings.xml b/core/res/res/values-cs/strings.xml index 7160b41..bbb3a7d 100644 --- a/core/res/res/values-cs/strings.xml +++ b/core/res/res/values-cs/strings.xml @@ -391,7 +391,6 @@ <item>"Ostatní"</item> <item>"Vlastní"</item> </string-array> - <string name="mobileEmailTypeName">"Mobilní"</string> <string-array name="postalAddressTypes"> <item>"Domů"</item> <item>"Práce"</item> diff --git a/core/res/res/values-da/strings.xml b/core/res/res/values-da/strings.xml index a3e8dc5..cb8fa78 100644 --- a/core/res/res/values-da/strings.xml +++ b/core/res/res/values-da/strings.xml @@ -429,7 +429,6 @@ <item>"Anden"</item> <item>"Tilpasset"</item> </string-array> - <string name="mobileEmailTypeName">"Mobil"</string> <string-array name="postalAddressTypes"> <item>"Start"</item> <item>"Arbejde"</item> diff --git a/core/res/res/values-de/strings.xml b/core/res/res/values-de/strings.xml index 56d9ef8..51de385 100644 --- a/core/res/res/values-de/strings.xml +++ b/core/res/res/values-de/strings.xml @@ -391,7 +391,6 @@ <item>"Andere"</item> <item>"Benutzerdefiniert"</item> </string-array> - <string name="mobileEmailTypeName">"Mobil"</string> <string-array name="postalAddressTypes"> <item>"Privat"</item> <item>"Arbeit"</item> diff --git a/core/res/res/values-el/strings.xml b/core/res/res/values-el/strings.xml index 5c6ba5a..723ab03 100644 --- a/core/res/res/values-el/strings.xml +++ b/core/res/res/values-el/strings.xml @@ -429,7 +429,6 @@ <item>"Άλλο"</item> <item>"Προσαρμοσμένο"</item> </string-array> - <string name="mobileEmailTypeName">"Κινητό"</string> <string-array name="postalAddressTypes"> <item>"Οικία"</item> <item>"Εργασία"</item> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 6eb1c01..d127f9c 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -429,7 +429,6 @@ <item>"Otros"</item> <item>"Personalización"</item> </string-array> - <string name="mobileEmailTypeName">"Celular"</string> <string-array name="postalAddressTypes"> <item>"Página principal"</item> <item>"Trabajo"</item> diff --git a/core/res/res/values-es/strings.xml b/core/res/res/values-es/strings.xml index 464e1a2..47bdd53 100644 --- a/core/res/res/values-es/strings.xml +++ b/core/res/res/values-es/strings.xml @@ -391,7 +391,6 @@ <item>"Otra"</item> <item>"Personalizar"</item> </string-array> - <string name="mobileEmailTypeName">"Móvil"</string> <string-array name="postalAddressTypes"> <item>"Casa"</item> <item>"Trabajo"</item> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index 6bd9389..4c1af4c 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -391,7 +391,6 @@ <item>"Autre"</item> <item>"Personnalisée"</item> </string-array> - <string name="mobileEmailTypeName">"Mobile"</string> <string-array name="postalAddressTypes"> <item>"Domicile"</item> <item>"Bureau"</item> diff --git a/core/res/res/values-it/strings.xml b/core/res/res/values-it/strings.xml index 1a18450..e05fdb1 100644 --- a/core/res/res/values-it/strings.xml +++ b/core/res/res/values-it/strings.xml @@ -391,7 +391,6 @@ <item>"Altro"</item> <item>"Personalizzato"</item> </string-array> - <string name="mobileEmailTypeName">"Cellulare"</string> <string-array name="postalAddressTypes"> <item>"Casa"</item> <item>"Ufficio"</item> diff --git a/core/res/res/values-ja/strings.xml b/core/res/res/values-ja/strings.xml index 618d16b..75ab0e8 100644 --- a/core/res/res/values-ja/strings.xml +++ b/core/res/res/values-ja/strings.xml @@ -429,7 +429,6 @@ <item>"その他"</item> <item>"カスタム"</item> </string-array> - <string name="mobileEmailTypeName">"携帯"</string> <string-array name="postalAddressTypes"> <item>"自宅"</item> <item>"仕事"</item> diff --git a/core/res/res/values-ko/strings.xml b/core/res/res/values-ko/strings.xml index d60ebaa..099f19c 100644 --- a/core/res/res/values-ko/strings.xml +++ b/core/res/res/values-ko/strings.xml @@ -429,7 +429,6 @@ <item>"기타"</item> <item>"맞춤설정"</item> </string-array> - <string name="mobileEmailTypeName">"모바일"</string> <string-array name="postalAddressTypes"> <item>"집"</item> <item>"회사"</item> diff --git a/core/res/res/values-nl/strings.xml b/core/res/res/values-nl/strings.xml index cd1b460..5aa1615 100644 --- a/core/res/res/values-nl/strings.xml +++ b/core/res/res/values-nl/strings.xml @@ -391,7 +391,6 @@ <item>"Overig"</item> <item>"Aangepast"</item> </string-array> - <string name="mobileEmailTypeName">"Mobiel"</string> <string-array name="postalAddressTypes"> <item>"Thuis"</item> <item>"Werk"</item> diff --git a/core/res/res/values-pl/strings.xml b/core/res/res/values-pl/strings.xml index 65f3ad1..6c65869 100644 --- a/core/res/res/values-pl/strings.xml +++ b/core/res/res/values-pl/strings.xml @@ -391,7 +391,6 @@ <item>"Inne"</item> <item>"Niestandardowy"</item> </string-array> - <string name="mobileEmailTypeName">"Komórka"</string> <string-array name="postalAddressTypes"> <item>"Dom"</item> <item>"Praca"</item> diff --git a/core/res/res/values-pt-rPT/strings.xml b/core/res/res/values-pt-rPT/strings.xml index d4623f9..313347b 100644 --- a/core/res/res/values-pt-rPT/strings.xml +++ b/core/res/res/values-pt-rPT/strings.xml @@ -429,7 +429,6 @@ <item>"Outro"</item> <item>"Personalizado"</item> </string-array> - <string name="mobileEmailTypeName">"Móvel"</string> <string-array name="postalAddressTypes"> <item>"Residência"</item> <item>"Emprego"</item> diff --git a/core/res/res/values-pt/strings.xml b/core/res/res/values-pt/strings.xml index 97d7596..214a0ea 100644 --- a/core/res/res/values-pt/strings.xml +++ b/core/res/res/values-pt/strings.xml @@ -429,7 +429,6 @@ <item>"Outros"</item> <item>"Personalizado"</item> </string-array> - <string name="mobileEmailTypeName">"Celular"</string> <string-array name="postalAddressTypes"> <item>"Página inicial"</item> <item>"Trabalho"</item> diff --git a/core/res/res/values-ru/strings.xml b/core/res/res/values-ru/strings.xml index 03284c1..1078809 100644 --- a/core/res/res/values-ru/strings.xml +++ b/core/res/res/values-ru/strings.xml @@ -429,7 +429,6 @@ <item>"Другой"</item> <item>"Особый"</item> </string-array> - <string name="mobileEmailTypeName">"Мобильный"</string> <string-array name="postalAddressTypes"> <item>"Домашний"</item> <item>"Рабочий"</item> diff --git a/core/res/res/values-sv/strings.xml b/core/res/res/values-sv/strings.xml index 383126a..567932f 100644 --- a/core/res/res/values-sv/strings.xml +++ b/core/res/res/values-sv/strings.xml @@ -429,7 +429,6 @@ <item>"Övrigt"</item> <item>"Anpassad"</item> </string-array> - <string name="mobileEmailTypeName">"Mobil"</string> <string-array name="postalAddressTypes"> <item>"Hem"</item> <item>"Arbete"</item> diff --git a/core/res/res/values-tr/strings.xml b/core/res/res/values-tr/strings.xml index ccaa08b..ecf7e41 100644 --- a/core/res/res/values-tr/strings.xml +++ b/core/res/res/values-tr/strings.xml @@ -429,7 +429,6 @@ <item>"Diğer"</item> <item>"Özel"</item> </string-array> - <string name="mobileEmailTypeName">"Mobil"</string> <string-array name="postalAddressTypes"> <item>"Ev"</item> <item>"İş"</item> diff --git a/core/res/res/values-zh-rCN/strings.xml b/core/res/res/values-zh-rCN/strings.xml index 48c4d38..0c651c9 100644 --- a/core/res/res/values-zh-rCN/strings.xml +++ b/core/res/res/values-zh-rCN/strings.xml @@ -429,7 +429,6 @@ <item>"其他邮箱"</item> <item>"自定义邮箱"</item> </string-array> - <string name="mobileEmailTypeName">"手机"</string> <string-array name="postalAddressTypes"> <item>"住宅地址"</item> <item>"单位地址"</item> diff --git a/core/res/res/values-zh-rTW/strings.xml b/core/res/res/values-zh-rTW/strings.xml index 0f9c423..a611532 100644 --- a/core/res/res/values-zh-rTW/strings.xml +++ b/core/res/res/values-zh-rTW/strings.xml @@ -391,7 +391,6 @@ <item>"其他信箱"</item> <item>"自訂"</item> </string-array> - <string name="mobileEmailTypeName">"行動裝置"</string> <string-array name="postalAddressTypes"> <item>"住家"</item> <item>"公司"</item> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index fd78f83..ad6d94f 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -598,7 +598,7 @@ <flag name="time" value="0x00000024" /> </attr> - <!-- Additional features you can enable in an IME associated with an editor, + <!-- Additional features you can enable in an IME associated with an editor to improve the integration with your application. The constants here correspond to those defined by {@link android.view.inputmethod.EditorInfo#imeOptions}. --> @@ -682,7 +682,7 @@ <attr name="y" format="dimension" /> <!-- Specifies how to place the content of an object, both - on the x and y axis, within the object itself. --> + on the x- and y-axis, within the object itself. --> <attr name="gravity"> <!-- Push object to the top of its container, not changing its size. --> <flag name="top" value="0x30" /> @@ -738,7 +738,7 @@ <attr name="entries" format="reference" /> <!-- Standard gravity constant that a child can supply to its parent. - Defines how to place the view, both its x and y axis, within its parent view group. --> + Defines how to place the view, both its x- and y-axis, within its parent view group. --> <attr name="layout_gravity"> <!-- Push object to the top of its container, not changing its size. --> <flag name="top" value="0x30" /> @@ -1817,7 +1817,7 @@ <attr name="minEms" format="integer" min="0" /> <!-- Makes the TextView be at least this many pixels wide --> <attr name="minWidth" /> - <!-- Specifies how to align the text by the view's x and/or y axis + <!-- Specifies how to align the text by the view's x- and/or y-axis when the text is smaller than the view. --> <attr name="gravity" /> <!-- Whether the text is allowed to be wider than the view (and @@ -3328,6 +3328,47 @@ <attr name="configure" format="string" /> </declare-styleable> + <!-- =============================== --> + <!-- Accounts package class attributes --> + <!-- =============================== --> + + <!-- Use <code>account-authenticator</code> as the root tag of the XML resource that + describes an account authenticator. + --> + <declare-styleable name="AccountAuthenticator"> + <!-- the account type this authenticator handles. --> + <attr name="accountType" format="string"/> + <!-- the user-visible name of the authenticator. --> + <attr name="label"/> + <!-- the icon of the authenticator. --> + <attr name="icon"/> + </declare-styleable> + + <!-- =============================== --> + <!-- Accounts package class attributes --> + <!-- =============================== --> + + <!-- Use <code>account-authenticator</code> as the root tag of the XML resource that + describes an account authenticator. + --> + <declare-styleable name="SyncAdapter"> + <!-- the authority of a content provider. --> + <attr name="contentAuthority" format="string"/> + <attr name="accountType"/> + </declare-styleable> + + <!-- =============================== --> + <!-- Contacts meta-data attributes --> + <!-- =============================== --> + + <declare-styleable name="Icon"> + <attr name="icon" /> + <attr name="mimeType" /> + </declare-styleable> + + <declare-styleable name="IconDefault"> + <attr name="icon" /> + </declare-styleable> </resources> diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index 7215685..f655b27 100644 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -36,6 +36,6 @@ <integer name="config_longAnimTime">300</integer> <!-- Flag indicating whether Last Name comes before First Name. - This becomes true in Japan, for example.--> + This becomes true in Japan, for example.--> <bool name="config_lastname_comes_before_firstname">false</bool> </resources> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 871c651..6906e43 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -5,16 +5,16 @@ *************************************************************** IMPORTANT NOTE FOR ANYONE MODIFYING THIS FILE READ THIS BEFORE YOU MAKE ANY CHANGES - + This file defines the binary compatibility for resources. As such, you must be very careful when making changes here, or you will completely break backwards compatibility with old applications. - + To avoid breaking compatibility, all new resources must be placed at the end of the list of resources of the same type. Placing a resource in the middle of type will cause all following resources to be assigned new resource numbers, breaking compatibility. - + *************************************************************** *************************************************************** --> <resources> @@ -22,7 +22,7 @@ <!-- We don't want to publish private symbols in android.R as part of the SDK. Instead, put them here. --> <private-symbols package="com.android.internal" /> - + <!-- AndroidManifest.xml attributes. --> <eat-comment /> @@ -569,10 +569,10 @@ <public type="attr" name="lineSpacingExtra" id="0x01010217" /> <public type="attr" name="lineSpacingMultiplier" id="0x01010218" /> <public type="attr" name="listChoiceIndicatorSingle" id="0x01010219" /> - <public type="attr" name="listChoiceIndicatorMultiple" id="0x0101021a" /> + <public type="attr" name="listChoiceIndicatorMultiple" id="0x0101021a" /> <public type="attr" name="versionCode" id="0x0101021b" /> <public type="attr" name="versionName" id="0x0101021c" /> - + <public type="id" name="background" id="0x01020000" /> <public type="id" name="checkbox" id="0x01020001" /> <public type="id" name="content" id="0x01020002" /> @@ -601,7 +601,7 @@ <public type="id" name="button1" id="0x01020019" /> <public type="id" name="button2" id="0x0102001a" /> <public type="id" name="button3" id="0x0102001b" /> - + <public type="style" name="Animation" id="0x01030000" /> <public type="style" name="Animation.Activity" id="0x01030001" /> <public type="style" name="Animation.Dialog" id="0x01030002" /> @@ -748,7 +748,7 @@ <public type="drawable" name="btn_plus" id="0x01080008" /> <public type="drawable" name="btn_radio" id="0x01080009" /> <public type="drawable" name="btn_star" id="0x0108000a" /> - <public type="drawable" name="btn_star_big_off" id="0x0108000b" /> + <public type="drawable" name="btn_star_big_off" id="0x0108000b" /> <public type="drawable" name="btn_star_big_on" id="0x0108000c" /> <public type="drawable" name="button_onoff_indicator_on" id="0x0108000d" /> <public type="drawable" name="button_onoff_indicator_off" id="0x0108000e" /> @@ -916,7 +916,7 @@ <public type="layout" name="select_dialog_item" id="0x01090011" /> <public type="layout" name="select_dialog_singlechoice" id="0x01090012" /> <public type="layout" name="select_dialog_multichoice" id="0x01090013" /> - + <public type="anim" name="fade_in" id="0x010a0000" /> <public type="anim" name="fade_out" id="0x010a0001" /> <public type="anim" name="slide_in_left" id="0x010a0002" /> @@ -929,9 +929,9 @@ Resources added in version 2 of the platform. =============================================================== --> <eat-comment /> - + <public type="attr" name="marqueeRepeatLimit" id="0x0101021d" /> - + <!-- =============================================================== Resources added in version 3 of the platform. =============================================================== --> @@ -1062,7 +1062,7 @@ <public type="id" name="stopSelectingText" id="0x01020029" /> <!-- Menu ID to perform a "add to dictionary" operation. --> <public type="id" name="addToDictionary" id="0x0102002a" /> - + <public type="style" name="Theme.InputMethod" id="0x01030054" /> <public type="style" name="Theme.NoDisplay" id="0x01030055" /> <public type="style" name="Animation.InputMethod" id="0x01030056" /> @@ -1070,7 +1070,7 @@ <public type="style" name="ButtonBar" id="0x01030058" /> <public type="style" name="Theme.Panel" id="0x01030059" /> <public type="style" name="Theme.Light.Panel" id="0x0103005a" /> - + <public type="string" name="dialog_alert_title" id="0x01040014" /> <public type="string" name="VideoView_error_text_invalid_progressive_playback" id="0x01040015" /> @@ -1081,7 +1081,7 @@ <!-- Drawable to use as a background for a taller version of the titlebar --> <public type="drawable" name="title_bar_tall" id="0x010800a6" /> - + <public type="integer" name="config_shortAnimTime" id="0x010e0000" /> <public type="integer" name="config_mediumAnimTime" id="0x010e0001" /> <public type="integer" name="config_longAnimTime" id="0x010e0002" /> @@ -1144,21 +1144,31 @@ <public-padding type="array" name="donut_resource_pad" end="0x01070010" /> - <public type="drawable" name="stat_sys_vp_phone_call" /> - <public type="drawable" name="stat_sys_vp_phone_call_on_hold" /> - - <public-padding type="drawable" name="donut_resource_pad" end="0x010800d0" /> + <public-padding type="anim" name="donut_resource_pad" end="0x010a0020" /> - <public-padding type="layout" name="donut_resource_pad" end="0x01090020" /> + <public-padding type="integer" name="donut_resource_pad" end="0x010e0010" /> <public type="anim" name="anticipate_interpolator" /> <public type="anim" name="overshoot_interpolator" /> <public type="anim" name="anticipate_overshoot_interpolator" /> <public type="anim" name="bounce_interpolator" /> <public type="anim" name="linear_interpolator" /> - - <public-padding type="anim" name="donut_resource_pad" end="0x010a0020" /> - <public-padding type="integer" name="donut_resource_pad" end="0x010e0010" /> + <public-padding type="drawable" name="donut_resource_pad" end="0x010800d0" /> + + <public-padding type="layout" name="donut_resource_pad" end="0x01090020" /> + +<!-- =============================================================== + Resources added in Eclair. + =============================================================== --> + <eat-comment /> + + <public type="attr" name="accountType" /> + <public type="attr" name="contentAuthority" /> + + <public type="drawable" name="stat_sys_vp_phone_call" /> + <public type="drawable" name="stat_sys_vp_phone_call_on_hold" /> + + </resources> diff --git a/core/res/res/values/strings.xml b/core/res/res/values/strings.xml index 9b9ba68..3f749e8 100644 --- a/core/res/res/values/strings.xml +++ b/core/res/res/values/strings.xml @@ -134,7 +134,7 @@ <string name="RestrictedOnNormal">Voice/SMS service is blocked.</string> <!-- Displayed to tell the user that all voice service is blocked by access control. --> <string name="RestrictedOnAll">All voice/SMS services are blocked.</string> - + <!-- Mappings between TS 27.007 +CFCC/+CLCK "service classes" and human-readable strings--> <skip /> <!-- Example: Service was enabled for: Voice, Data --> <string name="serviceClassVoice">Voice</string> @@ -231,6 +231,13 @@ <!-- Displayed a toast that a certificate is saved in the keystore --> <string name="certificateSaved">The certificate is saved in the system\'s key store.</string> + <!-- Account notifications --> <skip /> + <!-- A notification is shown when the AccountManager is unable to + supply an auth token without prompting the user to re-enter the + password. This is the text that will scroll through the + notification bar (will be seen by the user as he uses another application). --> + <string name="notification_title">Sign-in error</string> + <!-- Sync notifications --> <skip /> <!-- A notification is shown when there is a sync error. This is the text that will scroll through the notification bar (will be seen by the user as he uses another application). --> <string name="contentServiceSync">Sync</string> @@ -301,7 +308,7 @@ <!-- Label for the Android system components when they are shown to the user. --> <string name="android_system_label">Android System</string> - + <!-- Title of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. --> <string name="permgrouplab_costMoney">Services that cost you money</string> <!-- Description of a category of application permissions, listed so the user can choose whether they want to allow the application to do this. --> @@ -802,7 +809,7 @@ <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> <string name="permlab_readFrameBuffer">read frame buffer</string> <!-- Description of an application permission, listed so the user can choose whether they want to allow the application to do this. --> - <string name="permdesc_readFrameBuffer">Allows application to use + <string name="permdesc_readFrameBuffer">Allows application to read the content of the frame buffer.</string> <!-- Title of an application permission, listed so the user can choose whether they want to allow the application to do this. --> @@ -1111,9 +1118,6 @@ <item>Custom</item> </string-array> - <!-- String which means the type "mobile phone". --> - <string name="mobileEmailTypeName">Mobile</string> - <!-- The order of these is important, don't reorder without changing Contacts.java --> <skip /> <!-- Postal address types from android.provider.Contacts. This could be used when adding a new address for a contact, for example. --> <string-array name="postalAddressTypes"> @@ -1324,7 +1328,7 @@ <!-- Do not translate. WebView User Agent string --> <string name="web_user_agent"><xliff:g id="x">Mozilla/5.0 (Linux; U; Android %s) - AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1</xliff:g></string> + AppleWebKit/530.17 (KHTML, like Gecko) Version/4.0 Mobile Safari/530.17</xliff:g></string> <!-- Title for a JavaScript dialog. "The page at <url of current page> says:" --> <string name="js_dialog_title">The page at \'<xliff:g id="title">%s</xliff:g>\' says:</string> @@ -1380,8 +1384,8 @@ <string name="menu_delete_shortcut_label">delete</string> <!-- Strings used for search bar --><skip /> - - <!-- This is the default button label in the system-wide search UI. + + <!-- This is the default button label in the system-wide search UI. It is also used by the home screen's search "widget". It should be short --> <string name="search_go">Search</string> @@ -1437,7 +1441,7 @@ <item quantity="one">tomorrow</item> <item quantity="other">in <xliff:g id="count">%d</xliff:g> days</item> </plurals> - + <!-- This is used to express that something occurred some number of abbreviated seconds in the past (e.g., 5 secs ago). --> <plurals name="abbrev_num_seconds_ago"> <item quantity="one">1 sec ago</item> @@ -1756,7 +1760,7 @@ <string name="usb_storage_button_mount">Mount</string> <!-- See USB_STORAGE. This is the button text to ignore the plugging in of the phone.. --> <string name="usb_storage_button_unmount">Don\'t mount</string> - <!-- See USB_STORAGE_DIALOG. If there was an error mounting, this is the text. --> + <!-- See USB_STORAGE_DIALOG. If there was an error mounting, this is the text. --> <string name="usb_storage_error_message">There is a problem using your SD card for USB storage.</string> <!-- USB_STORAGE: When the user connects the phone to a computer via USB, we show a notification asking if he wants to share files across. This is the title --> <string name="usb_storage_notification_title">USB connected</string> @@ -1777,7 +1781,7 @@ <string name="usb_storage_stop_button_mount">Turn Off</string> <!-- See USB_STORAGE_STOP. This is the button text to cancel stoping usb storage. --> <string name="usb_storage_stop_button_unmount">Cancel</string> - <!-- See USB_STORAGE_STOP_DIALOG. If there was an error stopping, this is the text. --> + <!-- See USB_STORAGE_STOP_DIALOG. If there was an error stopping, this is the text. --> <string name="usb_storage_stop_error_message">We've encountered a problem turning off USB storage. Check to make sure you have unmounted the USB host, then try again.</string> <!-- External media format dialog strings --> @@ -1803,10 +1807,10 @@ <!-- Title of the pop-up dialog in which the user switches input method components. --> <string name="select_input_method">Select Input Method</string> - + <string name="fast_scroll_alphabet">\u0020ABCDEFGHIJKLMNOPQRSTUVWXYZ</string> <string name="fast_scroll_numeric_alphabet">\u00200123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ</string> - + <string name="candidates_style"><u>candidates</u></string> <!-- External media notification strings --> @@ -1853,23 +1857,23 @@ <!-- Long label for a button on a full-screen input method for the "Go" action. --> <string name="ime_action_go">Go</string> - + <!-- Long label for a button on a full-screen input method for the "Search" action. --> <string name="ime_action_search">Search</string> - + <!-- Long label for a button on a full-screen input method for the "Send" action. --> <string name="ime_action_send">Send</string> - + <!-- Long label for a button on a full-screen input method for the "Next" action. --> <string name="ime_action_next">Next</string> - + <!-- Long label for a button on a full-screen input method for the "Done" action. --> <string name="ime_action_done">Done</string> - + <!-- Long label for a button on a full-screen input method for an unknown action. --> <string name="ime_action_default">Execute</string> - - <!-- Strings for search suggestions. These are going here because they are referenced by both + + <!-- Strings for search suggestions. These are going here because they are referenced by both ContactsProvider and GoogleContactsProvider --> <skip /> @@ -1880,8 +1884,162 @@ <!-- This string appears (on two lines) when you type a number into contacts search, to let you create a contact whose phone number is the number you typed. The first line will be in bigger type than the second. --> <string name="create_contact_using">Create contact\nusing <xliff:g id="number" example="555">%s</xliff:g></string> - <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale pairs. This is used at startup to set a default locale by checking the system property ro.carrier for the carrier-id and searching through this array --> - <string-array translatable="false" name="carrier_locales"> + <!-- various string resources for Contacts --> + <string-array name="common_nicknames"> + <item>Albert, Al, Bert, Bertie</item> + <item>Alexander, Al, Alex, Lex, Sasha</item> + <item>Alexandra, Al, Alex, Allie, Ally, Lex, Lexie, Sandra, Sandy, Sasha</item> + <item>Alice, Allie, Ally</item> + <item>Alison, Allie, Ally</item> + <item>Allison, Allie, Ally</item> + <item>Amanda, Mandi, Mandy</item> + <item>Andrea, Andie</item> + <item>Andrew, Andy, Drew</item> + <item>Anthony, Tony, Toni, Tone</item> + <item>Arthur, Art, Arty</item> + <item>Barbara, Babs, Barb, Barbie</item> + <item>Benjamin, Ben, Benji, Benny</item> + <item>Bernard, Bern, Bernie</item> + <item>Bertram, Bert, Bertie</item> + <item>Bradly, Brad</item> + <item>Catherine, Cat, Cate, Cath, Catie, Cathy, Kat, Kate, Katie, Kathy</item> + <item>Charles, Chuck, Chaz, Charlie, Buck</item> + <item>Christine, Chris, Chrissy, Chrissie</item> + <item>Christopher, Chris</item> + <item>Cynthia, Cindy, Cynth</item> + <item>Daniel, Dan, Danny</item> + <item>David, Dave</item> + <item>Deborah, Deb, Debbie</item> + <item>Dennis, Den, Denny, Dean</item> + <item>Dolores, Dolly</item> + <item>Donald, Don, Donny</item> + <item>Donnatella, Donna</item> + <item>Dorothea, Dot, Dotty</item> + <item>Dorothy, Dot, Dotty</item> + <item>Douglas, Doug</item> + <item>Edward, Ed, Eddie, Ned, Neddie, Neddy, Ted, Teddy, Teddie</item> + <item>Eleanor, Ella, Ellie, Elle</item> + <item>Elisabetta, Betta</item> + <item>Elizabeth, Beth, Bess, Bessie, Betsy, Betty, Bette, Eliza, Lisa, Liza, Liz</item> + <item>Emily, Em, Ems, Emmy</item> + <item>Emma, Em, Ems, Emmy</item> + <item>Erica, Rikki, Rikkie, Ricky</item> + <item>Eugene, Gene</item> + <item>Florence, Flo</item> + <item>Frances, Fran, Francie</item> + <item>Francis, Fran, Frank</item> + <item>Frederick, Fred, Freddy</item> + <item>Gabriel, Gabe</item> + <item>Geoffrey, Jeff</item> + <item>Gerald, Gerry</item> + <item>Gerard, Gerry</item> + <item>Gregory, Greg</item> + <item>Harold, Hal, Hank, Harry</item> + <item>Henry, Hal, Hank, Harry</item> + <item>Herbert, Bert, Bertie</item> + <item>Irving, Irv</item> + <item>Isabella, Isa, Izzy</item> + <item>Jacob, Jake</item> + <item>Jacqueline, Jackie</item> + <item>James, Jim, Jimmy, Jamie, Jock</item> + <item>Janet, Jan</item> + <item>Janice, Jan</item> + <item>Jason, Jay</item> + <item>Jefferson, Jeff</item> + <item>Jeffrey, Jeff</item> + <item>Jennifer, Jen, Jenny</item> + <item>Jerome, Jerry</item> + <item>Jessica, Jessie</item> + <item>John, Jack, Jacky, Johnny, Jon</item> + <item>Jonathan, Jon, John</item> + <item>Joseph, Joe, Joey</item> + <item>Joshua, Josh</item> + <item>Kaitlyn, Cat, Cate, Catie, Cath, Cathy, Kat, Kate, Katie, Kathy</item> + <item>Katherine, Cat, Cate, Catie, Cath, Cathy, Kat, Kate, Katie, Kathy</item> + <item>Kathleen, Cat, Cate, Catie, Cath, Cathy, Kat, Kate, Katie, Kathy</item> + <item>Katrina, Cat, Cate, Catie, Cath, Cathy, Kat, Kate, Katie, Kathy</item> + <item>Kenneth, Ken</item> + <item>Kevin, Kev</item> + <item>Laura, Lauri, Laurie</item> + <item>Lauren, Lauri, Laurie</item> + <item>Laurence, Larry, Lauri, Laurie</item> + <item>Lawrence, Larry, Lauri, Laurie</item> + <item>Leonard, Leo, Len, Lenny</item> + <item>Leopold, Leo, Len, Lenny</item> + <item>Madeline, Maddie, Maddy</item> + <item>Margaret, Marge, Marg, Maggie, Mags, Meg, Peggy</item> + <item>Matthew, Matt, Mattie</item> + <item>Maureen, Mo</item> + <item>Maurice, Mo</item> + <item>Megan, Meg</item> + <item>Michael, Mickey, Mick, Mike, Mikey</item> + <item>Morris, Mo</item> + <item>Nancy, Nan</item> + <item>Nathan, Nat, Nate</item> + <item>Nathaniel, Nat, Nate</item> + <item>Nicholas, Nick</item> + <item>Pamela, Pam</item> + <item>Patricia, Pat, Patsy, Patty, Trish, Tricia</item> + <item>Patrick, Paddy, Pat, Patty, Patter, Rick, Ricky</item> + <item>Peter, Pete</item> + <item>Raymond, Ray</item> + <item>Philip, Phil</item> + <item>Rebecca, Becca</item> + <item>Richard, Rick, Rich, Dick</item> + <item>Robert, Bob, Rob, Robbie, Bobby, Rab</item> + <item>Roberta, Bobbie</item> + <item>Rodney. Rod</item> + <item>Ronald, Ron, Ronnie</item> + <item>Rosemary, Rosie, Rose</item> + <item>Russell, Russ, Rusty</item> + <item>Ryan, Ry</item> + <item>Samantha, Sam</item> + <item>Samuel, Sam, Sammy</item> + <item>Sophia, Sophie</item> + <item>Stephanie, Steph, Stephie</item> + <item>Stephen, Steve</item> + <item>Steven, Steve</item> + <item>Stuart, Stu</item> + <item>Susan, Sue, Susie, Suzie</item> + <item>Suzanne, Sue, Susie, Suzie</item> + <item>Teresa, Terrie, Terry</item> + <item>Theodora, Teddie, Thea, Theo</item> + <item>Theodore, Ted, Teddy, Theo</item> + <item>Thomas, Tom, Thom, Tommy</item> + <item>Timothy, Tim, Timmy</item> + <item>Valerie, Val</item> + <item>Veronica, Ronnie, Roni, Nica, Nikki, Nikka</item> + <item>Victor, Vic</item> + <item>Victoria, Vicky, Vicki, Vickie, Tori</item> + <item>Vincent, Vince, Vin, Vinnie</item> + <item>Vivian, Vivi</item> + <item>Walter, Walt, Wally</item> + <item>Wendy, Wen, Wendel</item> + <item>William, Bill, Billy, Will, Willy, Liam</item> + <item>Yvonna, Vonna</item> + <item>Zachary, Zach, Zack, Zac</item> + </string-array> + <string name="common_name_prefixes"> + 1LT, 1ST, 2LT, 2ND, 3RD, ADMIRAL, CAPT, CAPTAIN, COL, CPT, DR, + GEN, GENERAL, LCDR, LT, LTC, LTG, LTJG, MAJ, MAJOR, MG, MR, + MRS, MS, PASTOR, PROF, REP, REVEREND, REV, SEN, ST + </string> + <string name="common_name_suffixes"> + B.A., BA, D.D.S., DDS, I, II, III, IV, IX, JR, M.A., M.D, MA, + MD, MS, PH.D., PHD, SR, V, VI, VII, VIII, X + </string> + <string name="common_last_name_prefixes"> + D', DE, DEL, DI, LA, LE, MC, SAN, ST, TER, VAN, VON + </string> + <string name="common_name_conjunctions"> + &, AND, OR + </string> + + <!-- This string array should be overridden by the manufacture to present a list of carrier-id,locale,wifi-channel sets. This is used at startup to set system defaults by checking the system property ro.carrier for the carrier-id and searching through this array --> + <!-- An Array of [[Carrier-ID] --> + <!-- [default-locale] --> + <!-- [default-wifi-allowed-channels]] --> + <string-array translatable="false" name="carrier_properties"> </string-array> <!-- Title for the selected state of a CompoundButton. --> |
