diff options
19 files changed, 283 insertions, 627 deletions
diff --git a/api/current.xml b/api/current.xml index b48260231af3..422522ea0cd7 100644 --- a/api/current.xml +++ b/api/current.xml @@ -194914,7 +194914,7 @@ synchronized="false" static="false" final="false" - deprecated="not deprecated" + deprecated="deprecated" visibility="public" > <parameter name="contextStart" type="int"> @@ -266773,7 +266773,7 @@ deprecated="not deprecated" visibility="public" > -<parameter name="arg0" type="T"> +<parameter name="t" type="T"> </parameter> </method> </interface> diff --git a/core/java/android/speech/tts/TextToSpeech.java b/core/java/android/speech/tts/TextToSpeech.java index 6d7b7ce0282c..186af7062751 100755 --- a/core/java/android/speech/tts/TextToSpeech.java +++ b/core/java/android/speech/tts/TextToSpeech.java @@ -414,8 +414,10 @@ public class TextToSpeech { /** * {@hide} + * Total number of cached speech parameters. + * This number should be equal to (max param position/2) + 1. */ - protected static final int NB_CACHED_PARAMS = 20; + protected static final int NB_CACHED_PARAMS = 10; } /** diff --git a/core/java/android/text/SpannableStringBuilder.java b/core/java/android/text/SpannableStringBuilder.java index 53fa7c214e19..ea5cdfebfdea 100644 --- a/core/java/android/text/SpannableStringBuilder.java +++ b/core/java/android/text/SpannableStringBuilder.java @@ -1192,7 +1192,9 @@ implements CharSequence, GetChars, Spannable, Editable, Appendable, * CURSOR_AT_OR_BEFORE, or CURSOR_AT * @param p the Paint object that is requesting this information * @return the offset of the next position, or -1 + * @deprecated This is an internal method, refrain from using it in your code */ + @Deprecated public int getTextRunCursor(int contextStart, int contextEnd, int flags, int offset, int cursorOpt, Paint p) { diff --git a/core/java/android/widget/ListView.java b/core/java/android/widget/ListView.java index 2802144b5e06..427126b0e68e 100644 --- a/core/java/android/widget/ListView.java +++ b/core/java/android/widget/ListView.java @@ -3015,8 +3015,22 @@ public class ListView extends AbsListView { @Override public boolean isOpaque() { - return (mCachingActive && mIsCacheColorOpaque && mDividerIsOpaque && + boolean retValue = (mCachingActive && mIsCacheColorOpaque && mDividerIsOpaque && hasOpaqueScrollbars()) || super.isOpaque(); + if (retValue) { + // only return true if the list items cover the entire area of the view + final int listTop = mListPadding.top; + View first = getChildAt(0); + if (first == null || first.getTop() > listTop) { + return false; + } + final int listBottom = getHeight() - mListPadding.bottom; + View last = getChildAt(getChildCount() - 1); + if (last == null || last.getBottom() < listBottom) { + return false; + } + } + return retValue; } @Override diff --git a/core/res/res/layout/media_controller.xml b/core/res/res/layout/media_controller.xml index f4a701e6e074..582101a4959a 100644 --- a/core/res/res/layout/media_controller.xml +++ b/core/res/res/layout/media_controller.xml @@ -59,7 +59,7 @@ style="?android:attr/progressBarStyleHorizontal" android:layout_width="0dip" android:layout_weight="1" - android:layout_height="30dip" + android:layout_height="32dip" android:layout_alignParentLeft="true" android:layout_alignParentRight="true" /> diff --git a/core/res/res/values-es-rUS/strings.xml b/core/res/res/values-es-rUS/strings.xml index 68a225a90ee7..ae29e8344f32 100644 --- a/core/res/res/values-es-rUS/strings.xml +++ b/core/res/res/values-es-rUS/strings.xml @@ -211,7 +211,7 @@ <string name="permlab_enableCarMode" msgid="5684504058192921098">"habilitar el modo de auto"</string> <string name="permdesc_enableCarMode" msgid="5673461159384850628">"Permite que una aplicación habilite el modo auto."</string> <string name="permlab_killBackgroundProcesses" msgid="8373714752793061963">"eliminar los procesos de fondo"</string> - <string name="permdesc_killBackgroundProcesses" msgid="2908829602869383753">"Permite que una aplicación elimine los procesos de fondo de otras aplicaciones, aun si la memoria no es baja."</string> + <string name="permdesc_killBackgroundProcesses" msgid="2908829602869383753">"Permite que una aplicación elimine los procesos de fondo de otras aplicaciones, aun si la no queda poco espacio en la memoria."</string> <string name="permlab_forceStopPackages" msgid="1447830113260156236">"forzar la detención de otras aplicaciones"</string> <string name="permdesc_forceStopPackages" msgid="7263036616161367402">"Permite que una aplicación provoque la detención de otras aplicaciones."</string> <string name="permlab_forceBack" msgid="1804196839880393631">"provocar que la aplicación se acerque"</string> @@ -257,7 +257,7 @@ <string name="permdesc_bindWallpaper" msgid="5287754520361915347">"Permite al propietario vincularse a la interfaz de nivel superior de un fondo de pantalla. Se debe evitar utilizarlo en aplicaciones normales."</string> <string name="permlab_bindRemoteViews" msgid="5697987759897367099">"vincular a un servicio de widget"</string> <string name="permdesc_bindRemoteViews" msgid="2930855984822926963">"Permite al propietario vincularse a la interfaz de nivel superior del servicio de widget. Se debe evitar utilizarlo en aplicaciones normales."</string> - <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interactuar con un administrador de dispositivo"</string> + <string name="permlab_bindDeviceAdmin" msgid="8704986163711455010">"interactuar con un administrador de dispositivos"</string> <string name="permdesc_bindDeviceAdmin" msgid="8714424333082216979">"Permite que el propietario envíe sus intentos a un administrador de dispositivos. No se necesita para las aplicaciones normales."</string> <string name="permlab_setOrientation" msgid="3365947717163866844">"cambiar la orientación de la pantalla"</string> <string name="permdesc_setOrientation" msgid="6335814461615851863">"Admite una aplicación que cambia la rotación de la pantalla en cualquier momento. Se debe evitar utilizarlo en aplicaciones normales."</string> @@ -277,12 +277,12 @@ <string name="permdesc_installPackages" msgid="526669220850066132">"Admite una aplicación que instala paquetes de Android nuevos o actualizados. Las aplicaciones maliciosas pueden utilizarlo para agregar aplicaciones nuevas con permisos arbitrariamente potentes."</string> <string name="permlab_clearAppCache" msgid="4747698311163766540">"eliminar todos los datos de memoria caché de la aplicación"</string> <string name="permdesc_clearAppCache" product="tablet" msgid="3097119797652477973">"Permite que una aplicación libere espacio de almacenamiento en el tablet eliminando archivos del directorio de memoria caché de la aplicación. En general, el acceso es muy restringido para el proceso del sistema."</string> - <string name="permdesc_clearAppCache" product="default" msgid="7740465694193671402">"Admite una aplicación que libera espacio de almacenamiento en el teléfono al eliminar archivos del directorio de memoria caché de la aplicación. En general, el acceso es muy restringido para el proceso del sistema."</string> + <string name="permdesc_clearAppCache" product="default" msgid="7740465694193671402">"Permite que una aplicación libere espacio de almacenamiento en el teléfono borrando archivos del directorio de memoria caché de la aplicación. En general el acceso está muy restringido al proceso del sistema."</string> <string name="permlab_movePackage" msgid="728454979946503926">"Mover recursos de la aplicación"</string> <string name="permdesc_movePackage" msgid="6323049291923925277">"Permite a una aplicación mover recursos de aplicación de medios internos a externos y viceversa."</string> <string name="permlab_readLogs" msgid="6615778543198967614">"lee los datos confidenciales del registro"</string> <string name="permdesc_readLogs" product="tablet" msgid="4077356893924755294">"Permite que una aplicación lea diversos archivos de registro del sistema. Esto le permite descubrir información general acerca de lo que haces con el tablet, y puede potencialmente incluir información personal o privada."</string> - <string name="permdesc_readLogs" product="default" msgid="8896449437464867766">"Admite una aplicación que lee diversos archivos de registro del sistema. Esto te permite descubrir información general acerca de lo que haces con el teléfono, y puede potencialmente incluir información personal o privada."</string> + <string name="permdesc_readLogs" product="default" msgid="8896449437464867766">"Permite que una aplicación lea los diversos archivos de registro del sistema. Esto le permite descubrir información general acerca de lo que haces con el teléfono, y puede potencialmente incluir información personal o privada."</string> <string name="permlab_diagnostic" msgid="8076743953908000342">"leer y escribir a recursos dentro del grupo de diagnóstico"</string> <string name="permdesc_diagnostic" msgid="3121238373951637049">"Admite una aplicación que lee y escribe a cualquier recurso dentro del grupo de diagnóstico; por ejemplo, archivos con /dev. Esto puede afectar potencialmente la estabilidad y la seguridad del sistema. Debe utilizarlo SÓLO el fabricante o el operador en los diagnósticos específicos del hardware."</string> <string name="permlab_changeComponentState" msgid="79425198834329406">"activar o desactivar componentes de la aplicación"</string> @@ -296,15 +296,15 @@ <string name="permdesc_writeSecureSettings" msgid="5497873143539034724">"Permite a una aplicación modificar los datos de la configuración segura de los sistemas. Las aplicaciones normales no deben utilizarlo."</string> <string name="permlab_writeGservices" msgid="2149426664226152185">"modificar el mapa de servicios de Google"</string> <string name="permdesc_writeGservices" msgid="6602362746516676175">"Admite una aplicación que modifica el mapa de servicios de Google. Las aplicaciones normales no deben utilizarlo."</string> - <string name="permlab_receiveBootCompleted" msgid="7776779842866993377">"iniciar automáticamente durante la inicialización"</string> + <string name="permlab_receiveBootCompleted" msgid="7776779842866993377">"ejecutar automáticamente al iniciar"</string> <string name="permdesc_receiveBootCompleted" product="tablet" msgid="7530977064379338199">"Permite que una aplicación se inicie en cuanto el sistema haya finalizado la inicialización. Esto puede ocasionar que el tablet demore más en inicializar y que la aplicación retarde el funcionamiento total del tablet al estar en ejecución constante."</string> - <string name="permdesc_receiveBootCompleted" product="default" msgid="698336728415008796">"Admite una aplicación que se inicia cuando el sistema haya finalizado la inicialización. Esto puede ocasionar que se demore más tiempo en inicializar el teléfono y que la aplicación retarde el funcionamiento total del teléfono al estar en ejecución constante."</string> + <string name="permdesc_receiveBootCompleted" product="default" msgid="698336728415008796">"Permite que una aplicación se inicie en cuanto el sistema haya finalizado la inicialización. Esto puede ocasionar que el teléfono tarde más en inicializarse y que la aplicación demore el funcionamiento total del teléfono al estar en ejecución constante."</string> <string name="permlab_broadcastSticky" msgid="7919126372606881614">"enviar emisiones pegajosas"</string> <string name="permdesc_broadcastSticky" product="tablet" msgid="6322249605930062595">"Permite que una aplicación envíe emisiones adhesivas, que permanecen luego de que finaliza la emisión. Las aplicaciones maliciosas pueden hacer que la tableta funcione más lento y esté inestable haciendo que utilicen demasiada memoria."</string> <string name="permdesc_broadcastSticky" product="default" msgid="1920045289234052219">"Admite una aplicación que envía emisiones pegajosas, las cuales permanecen luego de que finaliza la emisión. Las aplicaciones maliciosas pueden hacer lento e inestable al teléfono, ya que ocasiona que utilice demasiada memoria."</string> <string name="permlab_readContacts" msgid="6219652189510218240">"leer datos de contacto"</string> <string name="permdesc_readContacts" product="tablet" msgid="7596158687301157686">"Permite que una aplicación lea todos los datos de de contacto (direcciones) almacenados en tu tablet. Las aplicaciones maliciosas pueden utilizarlo para enviar tus datos a otras personas."</string> - <string name="permdesc_readContacts" product="default" msgid="3371591512896545975">"Admite una aplicación que lee todos los datos de (direcciones) de contactos almacenados en tu teléfono. Las aplicaciones maliciosas pueden utilizarlo para enviar tus eventos de calendario a otras personas."</string> + <string name="permdesc_readContacts" product="default" msgid="3371591512896545975">"Permite que una aplicación lea todos los datos (direcciones) de contactos almacenados en tu tablet. Las aplicaciones maliciosas pueden utilizarlo para enviar tus datos a otras personas."</string> <string name="permlab_writeContacts" msgid="644616215860933284">"escribir datos de contacto"</string> <string name="permdesc_writeContacts" product="tablet" msgid="7782689510038568495">"Permite que una aplicación modifique los datos de (dirección) guardados en tu tablet. Las aplicaciones maliciosas pueden utilizarlo para borrar o modificar los datos de contacto."</string> <string name="permdesc_writeContacts" product="default" msgid="3924383579108183601">"Admite una aplicación que modifica los datos de (dirección de) contacto guardados en tu teléfono. Las aplicaciones maliciosas pueden utilizarlo para borrar o modificar los datos de contacto."</string> @@ -340,9 +340,9 @@ <string name="permdesc_brick" product="tablet" msgid="7379164636920817963">"Permite que la aplicación desactive todo el tablet de manera permanente. Esto es muy peligroso."</string> <string name="permdesc_brick" product="default" msgid="5569526552607599221">"Admite que la aplicación desactive todo el teléfono de manera permanente. Esto es muy peligroso."</string> <string name="permlab_reboot" product="tablet" msgid="3436634972561795002">"forzar reinicio del tablet"</string> - <string name="permlab_reboot" product="default" msgid="2898560872462638242">"provocar el reinicio del teléfono"</string> + <string name="permlab_reboot" product="default" msgid="2898560872462638242">"forzar reinicio del teléfono"</string> <string name="permdesc_reboot" product="tablet" msgid="4555793623560701557">"Permite que la aplicación provoque el reinicio del tablet."</string> - <string name="permdesc_reboot" product="default" msgid="7914933292815491782">"Admite que la aplicación provoque que el teléfono se reinicie."</string> + <string name="permdesc_reboot" product="default" msgid="7914933292815491782">"Permite que la aplicación fuerce el reinicio del tablet."</string> <string name="permlab_mount_unmount_filesystems" msgid="1761023272170956541">"montar y desmontar filesystems"</string> <string name="permdesc_mount_unmount_filesystems" msgid="6253263792535859767">"Admite que la aplicación monte y desmonte filesystems para obtener almacenamiento extraíble."</string> <string name="permlab_mount_format_filesystems" msgid="5523285143576718981">"espacio de almacenamiento externo del formato"</string> @@ -374,7 +374,7 @@ <string name="permlab_callPrivileged" msgid="4198349211108497879">"llamar directamente a cualquier número de teléfono"</string> <string name="permdesc_callPrivileged" msgid="244405067160028452">"Admite que la aplicación llame a cualquier número de teléfono, incluidos los números de emergencia, sin tu intervención. Las aplicaciones maliciosas pueden realizar llamadas innecesarias e ilegales a los servicios de emergencia."</string> <string name="permlab_performCdmaProvisioning" product="tablet" msgid="4842576994144604821">"iniciar directamente la configuración CDMA del tablet"</string> - <string name="permlab_performCdmaProvisioning" product="default" msgid="5604848095315421425">"comienza directamente la configuración CDMA del teléfono"</string> + <string name="permlab_performCdmaProvisioning" product="default" msgid="5604848095315421425">"iniciar directamente la configuración CDMA del teléfono"</string> <string name="permdesc_performCdmaProvisioning" msgid="6457447676108355905">"Admite la aplicación para comenzar con el aprovisionamiento CDMA. Las aplicaciones maliciosas pueden comenzar con el aprovisionamiento CDMA sin necesidad."</string> <string name="permlab_locationUpdates" msgid="7785408253364335740">"controlar las notificaciones de actualización de ubicación"</string> <string name="permdesc_locationUpdates" msgid="2300018303720930256">"Permite activar y desactivar las notificaciones de actualización de ubicación de la radio. Las aplicaciones normales no deben utilizarlo."</string> @@ -429,7 +429,7 @@ <string name="permlab_changeNetworkState" msgid="958884291454327309">"cambiar la conectividad de la red"</string> <string name="permdesc_changeNetworkState" msgid="4199958910396387075">"Permite que una aplicación cambie el estado de la conectividad de red."</string> <string name="permlab_changeTetherState" msgid="2702121155761140799">"Cambiar la conectividad de anclaje a red"</string> - <string name="permdesc_changeTetherState" msgid="8905815579146349568">"Permite que una aplicación cambie el estado de la conectividad de red del anclaje."</string> + <string name="permdesc_changeTetherState" msgid="8905815579146349568">"ermite que una aplicación cambie el estado de la conectividad de anclaje a red."</string> <string name="permlab_changeBackgroundDataSetting" msgid="1400666012671648741">"cambiar la configuración del uso de datos del fondo"</string> <string name="permdesc_changeBackgroundDataSetting" msgid="1001482853266638864">"Admite una aplicación que cambia la configuración del uso de datos del fondo."</string> <string name="permlab_accessWifiState" msgid="8100926650211034400">"ver el estado de Wi-Fi"</string> @@ -835,7 +835,7 @@ <string name="launch_warning_original" msgid="188102023021668683">"<xliff:g id="APP_NAME">%1$s</xliff:g> se inició originalmente."</string> <string name="smv_application" msgid="295583804361236288">"La aplicación <xliff:g id="APPLICATION">%1$s</xliff:g> (proceso <xliff:g id="PROCESS">%2$s</xliff:g>) ha violado su política StrictMode autoimpuesta."</string> <string name="smv_process" msgid="5120397012047462446">"El proceso <xliff:g id="PROCESS">%1$s</xliff:g> ha violado su política StrictMode autoimpuesta."</string> - <string name="heavy_weight_notification" msgid="9087063985776626166">"<xliff:g id="APP">%1$s</xliff:g> Correr"</string> + <string name="heavy_weight_notification" msgid="9087063985776626166">"<xliff:g id="APP">%1$s</xliff:g> en ejecución"</string> <string name="heavy_weight_notification_detail" msgid="2423977499339403402">"Selecciona cambiar la aplicación"</string> <string name="heavy_weight_switcher_title" msgid="1135403633766694316">"¿Deseas cambiar aplicaciones?"</string> <string name="heavy_weight_switcher_text" msgid="4592075610079319667">"Ya se está ejecutando una aplicación que debe detenerse antes de iniciar una nueva."</string> @@ -923,17 +923,17 @@ <string name="ext_media_unmountable_notification_message" product="nosdcard" msgid="529021299294450667">"Almacenamiento USB dañado. Es posible que debas reformatearlo."</string> <string name="ext_media_unmountable_notification_message" product="default" msgid="6902531775948238989">"Tarjeta SD dañada. Es posible que debas reformatearla."</string> <string name="ext_media_badremoval_notification_title" product="nosdcard" msgid="1661683031330951073">"Almacenamiento USB extraído inesperadamente"</string> - <string name="ext_media_badremoval_notification_title" product="default" msgid="6872152882604407837">"Tarjeta SD extraída de forma imprevista"</string> + <string name="ext_media_badremoval_notification_title" product="default" msgid="6872152882604407837">"Almacenamiento USB extraído de forma imprevista"</string> <string name="ext_media_badremoval_notification_message" product="nosdcard" msgid="4329848819865594241">"Desmontar el almacenamiento USB antes de extraerlo para evitar la pérdida de datos."</string> <string name="ext_media_badremoval_notification_message" product="default" msgid="7260183293747448241">"Desmontar la tarjeta SD antes de extraerla para evitar la pérdida de datos."</string> <string name="ext_media_safe_unmount_notification_title" product="nosdcard" msgid="3967973893270360230">"Es seguro extraer el almacenamiento USB"</string> - <string name="ext_media_safe_unmount_notification_title" product="default" msgid="6729801130790616200">"Tarjeta SD fácil de extraer"</string> + <string name="ext_media_safe_unmount_notification_title" product="default" msgid="6729801130790616200">"Es seguro extraer la tarjeta SD"</string> <string name="ext_media_safe_unmount_notification_message" product="nosdcard" msgid="6142195361606493530">"Puedes extraer de forma segura el almacenamiento USB."</string> - <string name="ext_media_safe_unmount_notification_message" product="default" msgid="568841278138377604">"Puedes eliminar la tarjeta SD sin riesgos."</string> + <string name="ext_media_safe_unmount_notification_message" product="default" msgid="568841278138377604">"Puedes extraer de forma segura la tarjeta SD."</string> <string name="ext_media_nomedia_notification_title" product="nosdcard" msgid="4486377230140227651">"Almacenamiento USB extraído"</string> <string name="ext_media_nomedia_notification_title" product="default" msgid="8902518030404381318">"Tarjeta SD extraída"</string> <string name="ext_media_nomedia_notification_message" product="nosdcard" msgid="6921126162580574143">"Almacenamiento USB eliminado. Insertar nuevos medios."</string> - <string name="ext_media_nomedia_notification_message" product="default" msgid="3870120652983659641">"Tarjeta SD eliminada. Inserta una nueva."</string> + <string name="ext_media_nomedia_notification_message" product="default" msgid="3870120652983659641">"Tarjeta SD extraída. Insertar una nueva."</string> <string name="activity_list_empty" msgid="4168820609403385789">"No se encontraron actividades coincidentes"</string> <string name="permlab_pkgUsageStats" msgid="8787352074326748892">"actualizar la estadística de uso de los componentes"</string> <string name="permdesc_pkgUsageStats" msgid="891553695716752835">"Permite la modificación de estadísticas recopiladas sobre el uso de componentes. Las aplicaciones normales no deben utilizarlo."</string> @@ -966,8 +966,8 @@ <string name="chooser_wallpaper" msgid="7873476199295190279">"Cambiar fondo de pantalla"</string> <string name="pptp_vpn_description" msgid="2688045385181439401">"Protocolo de túnel punto a punto"</string> <string name="l2tp_vpn_description" msgid="3750692169378923304">"Protocolo de túnel de nivel 2"</string> - <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"Clave previamente compartida según L2TP/IPSec VPN"</string> - <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"Certificado según L2TP/IPSec VPN"</string> + <string name="l2tp_ipsec_psk_vpn_description" msgid="3945043564008303239">"VPN L2TP/IPSec basada en clave compartida previamente"</string> + <string name="l2tp_ipsec_crt_vpn_description" msgid="5382714073103653577">"VPN L2TP/IPSec basada en certificado"</string> <string name="upload_file" msgid="2897957172366730416">"Elegir archivo"</string> <string name="no_file_chosen" msgid="6363648562170759465">"No se seleccionó un archivo."</string> <string name="reset" msgid="2448168080964209908">"Restablecer"</string> @@ -995,7 +995,7 @@ <string name="progress_erasing" product="nosdcard" msgid="4183664626203056915">"Borrando almacenamiento USB..."</string> <string name="progress_erasing" product="default" msgid="2115214724367534095">"Borrando tarjeta SD..."</string> <string name="format_error" product="nosdcard" msgid="4320339096529911637">"No pudo borrar el almacenamiento USB."</string> - <string name="format_error" product="default" msgid="1343380371925238343">"No pudo borrar la tarjeta SD."</string> + <string name="format_error" product="default" msgid="1343380371925238343">"No se pudo borrar la tarjeta SD."</string> <string name="media_bad_removal" msgid="7960864061016603281">"Se ha extraído la tarjeta SD antes de ser desmontada."</string> <string name="media_checking" product="nosdcard" msgid="418188720009569693">"Se está verificando el almacenamiento USB en este momento."</string> <string name="media_checking" product="default" msgid="7334762503904827481">"Se está verificando la tarjeta SD en este momento."</string> diff --git a/core/res/res/values-fr/strings.xml b/core/res/res/values-fr/strings.xml index cba5a15ac278..44cefa32314f 100644 --- a/core/res/res/values-fr/strings.xml +++ b/core/res/res/values-fr/strings.xml @@ -160,7 +160,7 @@ <string name="permgroupdesc_messages" msgid="7045736972019211994">"Permet de lire et rédiger vos SMS, e-mails et autres messages."</string> <string name="permgrouplab_personalInfo" msgid="3519163141070533474">"Vos informations personnelles"</string> <string name="permgroupdesc_personalInfo" product="tablet" msgid="6975389054186265786">"Accéder directement aux contacts et à l\'agenda enregistrés sur la tablette"</string> - <string name="permgroupdesc_personalInfo" product="default" msgid="5488050357388806068">"Accédez directement aux contacts et à l\'agenda enregistrés sur votre téléphone."</string> + <string name="permgroupdesc_personalInfo" product="default" msgid="5488050357388806068">"Accéder directement aux contacts et à l\'agenda enregistrés sur votre téléphone"</string> <string name="permgrouplab_location" msgid="635149742436692049">"Votre position"</string> <string name="permgroupdesc_location" msgid="2430258821648348660">"Suivre votre position géographique"</string> <string name="permgrouplab_network" msgid="5808983377727109831">"Communications réseau"</string> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 41ee55af0870..11c3916ee967 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -982,7 +982,7 @@ <eat-comment /> <style name="MediaButton"> - <item name="android:background">@android:drawable/media_button_background</item> + <item name="android:background">@null</item> <item name="android:layout_width">71dip</item> <item name="android:layout_height">52dip</item> </style> diff --git a/docs/html/guide/guide_toc.cs b/docs/html/guide/guide_toc.cs index b13600cc742c..c258949c2728 100644 --- a/docs/html/guide/guide_toc.cs +++ b/docs/html/guide/guide_toc.cs @@ -630,7 +630,7 @@ <span class="zh-TW" style="display:none">準備發佈</span> </a></li> <li><a href="<?cs var:toroot ?>guide/publishing/publishing.html"> - <span class="en">Publishing Your Applications</span> + <span class="en">Publishing on Android Market</span> </a></li> </ul> </li> diff --git a/docs/html/guide/publishing/publishing.jd b/docs/html/guide/publishing/publishing.jd index af1ea749f2e9..dd1115d7bf1d 100644 --- a/docs/html/guide/publishing/publishing.jd +++ b/docs/html/guide/publishing/publishing.jd @@ -1,4 +1,4 @@ -page.title=Publishing Your Applications +page.title=Publishing on Android Market @jd:body <div id="qv-wrapper"> @@ -16,22 +16,22 @@ page.title=Publishing Your Applications <h2>In this document</h2> <ol> -<li><a href="#overview">Publishing on Android Market</a> - <ol> - <li><a href="#marketupgrade">Publishing Updates on Android Market</a></li> - <li><a href="#marketLicensing">Using Android Market Licensing Service</a></li> - <li><a href="#marketintent">Using Intents to Launch the Market Application</a></li> - </ol></li> -<!-- -<li><span style="color:ccc">Publishing on Other Hosted Services</a></li> -<li><span style="color:ccc">Publishing through a Web Server</a></li> ---> +<li><a href="#overview">About Android Market</a> +<li><a href="#marketupgrade">Publishing Updates on Android Market</a></li> +<li><a href="#marketLicensing">Using Android Market Licensing Service</a></li> +<li><a href="#marketintent">Linking to Your Apps on Android Market</a> + <ol> + <li><a href="#OpeningDetails">Opening an app's details page</a></li> + <li><a href="#PerformingSearch">Performing a search</a></li> + <li><a href="#UriSummary">Summary of URI formats</a></li> + </ol> +</li> </ol> <h2>See also</h2> <ol> -<li><a href="{@docRoot}guide/publishing/licensing.html">Licensing Your Applications</a></li> +<li><a href="{@docRoot}guide/publishing/licensing.html">Application Licensing</a></li> <li><a href="{@docRoot}guide/publishing/preparing.html">Preparing to Publish</a></li> </ol> @@ -39,43 +39,45 @@ page.title=Publishing Your Applications <img id="rule" src="{@docRoot}assets/images/grad-rule-qv.png"> <div id="qv-sub-rule"> <img src="{@docRoot}assets/images/icon_market.jpg" style="float:left;margin:0;padding:0;"> - <p style="color:#669999;">Interested in publishing your app on Android Market?</p> - <a id="publish-link" href="http://market.android.com/publish">Go to Android Market »</a> + <h2 style="color:#669999;">Interested in publishing your app on Android Market?</h2> + <p><a href="http://market.android.com/publish">Go to Android Market</a> to +create a developer account and upload your application. For more information about the +required assets, listing details, and options, see <a +href="http://market.android.com/support/bin/answer.py?answer=113469">Uploading +applications</a>.</p> </div> </div> </div> </div> -<p>Publishing an application means testing it, packaging it appropriately, and making -it available to users of Android-powered mobile devices for download or sideload.</p> +<p>If you've followed the steps outlined in <a +href="{@docRoot}guide/publishing/preparing.html">Preparing to Publish</a>, the result of the process +is a compiled {@code .apk} file that is signed with your private release key. Your application is +now ready to be published publicly so users can install it.</p> -<p>If you've followed the steps outlined in -<a href="{@docRoot}guide/publishing/preparing.html">Preparing to -Publish Your Applications</a>, the result of the process is a compiled .apk that -is signed with your release private key. Inside the .apk, the application is -properly versioned and any MapView elements reference a Maps API Key that you -obtained by registering the MD5 fingerprint of the same certificate used to sign -the .apk. Your application is now ready for publishing. </p> +<p>You can publish your application and allow users to install it any way you choose, including +from your own web server. This document provides information about publishing your Android +application with Android Market.</p> -<p>The sections below provide information about publishing your Android -application to mobile device users.</p> -<h2 id="overview">Publishing on Android Market</h2> +<h2 id="overview">About Android Market</h2> -<p>Android Market is a hosted service that makes it easy for users to find and -download Android applications to their Android-powered devices, and makes it -easy for developers to publish their applications to Android users.</p> +<p>Android Market is a service that makes it easy for users to find and download Android +applications to their Android-powered devices, either from the Android Market application on their +device or from the Android Market web site (<a +href="http://market.android.com">market.android.com</a>). As a developer, you can use Android Market +to distribute your applications to users on all types of Android-powered devices, all around the +world.</p> <p>To publish your application on Android Market, you first need to register -with the service using your Google account and agree to the terms of service. +with the service using a Google account and agree to the terms of service. Once you are registered, you can upload your application to the service whenever -you want, as many times as you want, and then publish it when you are ready. -Once published, users can see your application, download it, and rate it using -the Market application installed on their Android-powered devices. </p> +you want, update it as many times as you want, and then publish it when you are ready. +Once published, users can see your application, download it, and rate it. </p> <p>To register as an Android Market developer and get started with publishing, -visit the Android Market: </p> +visit the Android Market publisher site: </p> <p style="margin-left:3em;"><a href="http://market.android.com/publish">http://market.android.com/publish</a> @@ -94,22 +96,24 @@ validity period ends after <span style="color:red">22 October 2033</span>. </li> <code>android:versionName</code> attribute in the <a href="{@docRoot}guide/topics/manifest/manifest-element.html"><code><manifest></code></a> -element of its manifest. The server uses the <code>android:versionCode</code> as +element of its manifest file. The server uses the <code>android:versionCode</code> as the basis for identifying the application internally and handling updates, and it displays the <code>android:versionName</code> to users as the application's version.</li> <li>Your application must define both an <code>android:icon</code> and an -<code>android:label</code> attribute in the <code><application></code> -element of its manifest.</li> +<code>android:label</code> attribute in the <a +href="{@docRoot}guide/topics/manifest/application-element.html"><code><application></code></a> +element of its manifest file.</li> </ol> </div> -<h3 id="marketupgrade">Publishing Updates on Android Market</h3> + +<h2 id="marketupgrade">Publishing Updates on Android Market</h2> <p>At any time after publishing an application on Android Market, you can upload and publish an update to the same application package. When you publish an update to an application, users who have already installed the -application will automatically receive a notification that an update is +application may receive a notification that an update is available for the application. They can then choose to update the application to the latest version.</p> @@ -117,190 +121,231 @@ to the latest version.</p> the <code>android:versionCode</code> and <code>android:versionName</code> attributes in the <a href="{@docRoot}guide/topics/manifest/manifest-element.html"><code><manifest></code></a> -element of the manifest file. Also, the package name must be the same and the -.apk must be signed with the same private key. If the package name and signing +element of the manifest file. Also, the package name must be the same as the existing version and +the {@code .apk} file must be signed with the same private key. If the package name and signing certificate do <em>not</em> match those of the existing version, Market will -consider it a new application and will not offer it to users as an update.</p> +consider it a new application, publish it as such, and will not offer it to existing users as an +update.</p> -<h3 id="marketLicensing">Using Android Market Licensing Service</h3> +<h2 id="marketLicensing">Using Android Market Licensing Service</h2> <p>Android Market offers a licensing service that lets you enforce licensing policies for paid applications that you publish through Android Market. With -Android Market Licensing, your applications can query Android Market at run time -to obtain their licensing status for the current user, then allow or disallow -further use as appropriate. Using the service, you can apply a flexible -licensing policy on an application-by-application basis — each +Android Market Licensing, your applications can query Android Market at runtime +to obtain the licensing status for the current user, then allow or disallow +further use of the application as appropriate. Using the service, you can apply a flexible +licensing policy on an application-by-application basis—each application can enforce its licensing status in the way most appropriate for it. </p> <p>Any application that you publish through Android Market can use the Android -Market Licensing Service. The service uses no dedicated framework APIs, you can -add licensing to any legacy application that uses a minimum API level of 3 or +Market Licensing Service. The service uses no dedicated framework APIs, so you can +add licensing to any application that uses a minimum API Level of 3 or higher.</p> <p>For complete information about Android Market Licensing Service and how to -use it in your application, see <a -href="{@docRoot}guide/publishing/licensing.html">Licensing Your -Applications</a>.</p> +use it in your application, read <a +href="{@docRoot}guide/publishing/licensing.html">Application Licensing</a>.</p> -<h3 id="marketintent">Using Intents to Launch the Market Application on -a Device</h3> -<p>Android-powered devices include a preinstalled Market application that gives -users access to the Android Market site. From Market, users can -browse or search available applications, read ratings and reviews, and -download/install applications.</p> +<h2 id="marketintent">Linking to Your Apps on Android Market</h2> -<p>You can launch the Market application from another Android -application by sending an Intent to the system. You might want to do -this, for example, to help the user locate and download an update to an -installed application, or to let the user know about related -applications that are available for download. </p> +<p>To help users discover your published applications, you can use two special Android Market URIs +that direct users to your application's details page or perform a search for all of your published +applications in Android Market. You can use these URIs to do the following:</p> -<p>To launch Market, you send an ACTION_VIEW Intent, passing a Market-handled -URI string as the Intent data. In most cases, your application would call -startActivity() to send the ACTION_VIEW Intent with the Market-handled URI.</p> - -<p>The URI that you supply with the Intent lets the system route the intent -properly and also expresses the type of action that you want Market to perform -after launch. Currently, you can have Market take these actions:</p> +<ul> + <li>Create a button in your application or a link on a web page that opens one of your +application's details page in the Android Market application or web site.</li> + <li>Create a button in your application or a link on a web page that searches for all your +published applications in the Android Market application or web site.</li> +</ul> +<p>You can launch the Android Market application or web site in the following ways:</p> <ul> -<li>Initiate a search for applications on Android Market, based on the query -parameters that you provide, or </li> -<li>Load the Details page for a specific application on Android Market, based on -the application's package name.</li> + <li>Initiate an {@link android.content.Intent} from your application that launches the +Android Market application on the user's device. The intent must use the {@link +android.content.Intent#ACTION_VIEW} action, and include intent data with the appropriate +Android Market URI scheme.</li> + <li>Provide a hyperlink on a web page that opens the Android Market web site.</li> </ul> -<h4>Initiating a search</h4> +<p>In both cases, you need to create a URI that indicates either the application you'd like to view +in Android Market or the search you'd like to perform. The URI is quite similar whether you want +to open the application or open the web site. The only difference is the URI prefix.</p> + +<p>To open the Android Market application on the device, the prefix for the intent's data URI +is:</p> + +<p style="margin-left:2em"><code>market://</code></p> + +<p>To open the Android Market web site, the prefix for the link URI is:</p> + +<p style="margin-left:2em"><code>http://market.android.com/</code></p> + +<p>To complete each URI, you must append a string that specifies either the +application for which you want to view or the search to execute. The following sections +describe how to create a complete URI for each case.</p> + +<p class="note"><strong>Note:</strong> If you create a link to open the Android Market web site and +the user selects it from an Android-powered device, the Android Market application will also resolve +the link so the user can use the native application instead of the web site. Also, because the +Android Market application also reads the {@code http://} URIs, you can also use them in an intent, +but you should usually use the {@code market://} URIs for an intent, so that the native application +is opened by default. You should use {@code http://} URIs only when creating links from a web +page.</p> + + +<h3 id="OpeningDetails">Opening an app's details page</h3> -<p>Your application can initiate a search on Android Market for applications -that match the query parameters that you provide. To do so, your application -sends an ACTION_VIEW Intent that includes a URI and query parameters in this +<p>As described above, you can open the details page for a specific application either on the +Android Market application or the Android Market web site. The details page allows the user to see +the application description, screenshots, reviews and more, and choose to install it.</p> + +<p>The format for the URI that opens the details page is:</p> + +<p style="margin-left:2em"><code><URI_prefix><b>details?id=</b><package_name></code></p> + +<p>The <code><package_name></code> is a placeholder for the target application's fully +qualified package name, as declared in the <a +href="{@docRoot}guide/topics/manifest/manifest-element.html#package">{@code +package}</a> attribute of the <a href="{@docRoot}guide/topics/manifest/manifest-element.html">{@code +<manifest>}</a> element in the application's manifest file.</p> + + +<h4>Opening details in the Android Market application</h4> + +<p>To open the details page in the Android Market application, create an intent with the +{@link android.content.Intent#ACTION_VIEW} action and include a data URI in this format:</p> + +<p style="margin-left:2em"><code>market://details?id=<package_name></code></p> + +<p>For example, here's how you can create an intent and open an application's details page in the +Android Market application:</p> + +<pre> +Intent intent = new Intent(Intent.ACTION_VIEW); +intent.setData(Uri.parse("market://details?id=com.android.example")); +startActivity(intent); +</pre> + + +<h4>Opening details on the Android Market web site</h4> + +<p>To open the details page on the Android Market web site, create a link with a URI in this format:</p> -<p style="margin-left:2em"><code>market://search?q=<paramtype>:<value></code></p> - -<div class="sidebox-wrapper" xstyle="margin-bottom:2em;margin-top:.5em;width:90%;"> - <img id="rule" src="{@docRoot}assets/images/grad-rule-qv.png"> - <div id="qv-sub-rule"> - <img src="{@docRoot}assets/images/icon_market.jpg" style="float:left;margin:0;padding:0;"> - <p style="color:#669999;">Searches on Android Market</p> -<p>When you initiate a search, Android Market returns results from matches in -the public metadata supplied by developers in their Android Market profiles or -application publishing information, but not from the developer's private account -or from the certificate used to sign the application. </p> - </div> -</div> +<p style="margin-left:2em"> + <code>http://market.android.com/details?id=<package_name></code> +</p> + +<p>For example, here's a link that opens an application's details page on the Android Market web +site:</p> + +<pre> +<a href="http://market.android.com/details?id=com.android.example">App Link</a> +</pre> + -<p>Using this URI format, you can search for applications by:</p> + +<h3 id="PerformingSearch">Performing a search</h3> + +<p>To initiate a search in Android Market, the format for the URI is:</p> + +<p style="margin-left:2em"> + <code><URI_prefix><b>search?q=</b><query></code> +</p> + +<p>The <code><query></code> is a placeholder for the search query to execute in Android +Market. The query can be a raw text string or you can include parameters that perform a search +based on the publisher name or application package name:</p> <ul> -<li>Package name</li> -<li>Developer name</li> -<li>String match across application name, developer name, and -description, or </li> -<li>Any combination of the above</li> + <li>To search based on the publisher name, use the {@code pub:} parameter: + <p><code><URI_prefix><b>search?q=pub:</b><publisher_name></code></p> + <p>You can use this type of search to show all of your published applications.</p></li> + + <li>To search based on the package name, use the {@code pname:} parameter: + <p><code><URI_prefix><b>search?q=pname:</b><package_name></code></p></li> </ul> -<p>The table at the bottom of this page specifies the <code>paramtypes</code> -and <code>values</code> that correspond to each of these types of search. </p> -<p>When you send an intent to initiate a search for applications, Market sends -the search query to the server and displays the result. To the user, the -experience is something like this: </p> +<h4>Searching the Android Market application</h4> -<ol> -<li>The user presses a link or button in your application.</li> -<li>The Market application launches and takes control of the screen, displaying -a progress indicator labeled "Searching" until it receives the search -results.</li> -<li>Market receives the search results and displays them. Depending on the query -parameters, the search results may include a list of one or more applications. -</li> -<li>From the results page, the user can select an app to go to its Details page, -which offers information about the app and lets the user download/purchase the -app.</li> -</ol> +<p>To perform a search in the Android Market application, create an intent with the +{@link android.content.Intent#ACTION_VIEW} action and include a data URI in this format:</p> -<h4>Loading an application's Details page</h4> +<p style="margin-left:2em"><code>market://search?q=<query></code></p> -<p>In Android Market, every application has a Details page that provides an -overview of the application for users. For example, the page includes a short -description of the app and screen shots of it in use, if supplied by the -developer, as well as feedback from users and information about the developer. -The Details page also includes an "Install" button that lets the user trigger -the download/purchase of the application.</p> +<p>The query may include the {@code pub:} or {@code pname:} parameters described above.</p> -<p>If you want to refer the user to a specific appplication, your application -can take the user directly to the application's Details page. To do so, your -application sends an ACTION_VIEW Intent that includes a URI and query parameter -in this format:</p> +<p>For example, here's how you can initiate a search in the Android Market application, based on the +publisher name:</p> -<p style="margin-left:2em"><code>market://details?id=<packagename></code></p> +<pre> +Intent intent = new Intent(Intent.ACTION_VIEW); +intent.setData(Uri.parse("market://search?q=pub:Your Publisher Name")); +startActivity(intent); +</pre> -<p>In this case, the <code>packagename</code> parameter is target application's -fully qualified package name, as declared in the <code>package</code> attribute -of the <code>manifest</code> element in the application's manifest file. For example:</p> -<p style="margin-left:2em"><code>market://details?id=com.example.android.jetboy</code></p> +<h4>Searching the Android Market web site</h4> + +<p>To perform a search on the Android Market web site, create a link with a URI in this +format:</p> + +<p style="margin-left:2em"> + <code>http://market.android.com/search?q=<query></code> +</p> + +<p>The query may include the {@code pub:} or {@code pname:} parameters described above.</p> + +<p>For example, here's a link that initiates a search on the Android Market web site, based on the +publisher name:</p> + +<pre> +<a href="http://market.android.com/search?q=pub:Your Publisher Name">Search Link</a> +</pre> -<h4>Android Market URIs</h4> -<p>The table below provides a list of URIs and actions currently -supported by the Market application.</p> -<p>Note that these URIs work only when passed as Intent data — you -can't currently load the URIs in a web browser, either on a desktop machine or -on the device. </p> +<h3 id="UriSummary">Summary of URI formats</h3> + +<p>The table below provides a summary of the URIs currently supported by the Android Market (both on +the web and in the Android application), as discussed in the previous sections.</p> <table> <tr> -<th width="25%">For this Result</th> -<th>Pass this URI with the ACTION_VIEW Intent</th> -<th width="36%">Comments</th> -</tr> -<tr> -<td>Display the Details screen for a specific application, as identified -by the app's fully qualified package name.</td> -<td><code>http://market.android.com/details?id=<packagename></code> -or<br> -<code>market://details?id=<packagename></code></td> -<td>Note that the package name that you specify is <em>not</em> specific to any -version of an application. Therefore, Market always displays the Details page for the -latest version of the application.</td> +<th>For this result</th> +<th>Use this URI in a web page link</th> +<th>Or this URI in an {@link android.content.Intent#ACTION_VIEW} intent</th> </tr> + <tr> -<td>Search for an application by its fully qualified Java package name and -display the result.</td> -<td><code>http://market.android.com/search?q=pname:<package></code> or<br> -<code>market://search?q=pname:<package></code></td> -<td>Searches only the Java package name of applications. Returns only exact -matches.</td> +<td>Display the details screen for a specific application</td> +<td><code>http://market.android.com/details?id=<package_name></code> +<td><code>market://details?id=<package_name></code></td> </tr> <tr> -<td>Search for applications by developer name and display the results.</td> -<td><code>http://market.android.com/search?q=pub:<Developer Name></code> -or<br> <code>market://search?q=pub:<Developer Name></code></td> -<td>Searches only the "Developer Name" fields of Market public profiles. -Returns exact matches only. </td> +<td>Search for applications using a general string query.</td> +<td><code>http://market.android.com/search?q=<query></code></td> +<td><code>market://search?q=<query></code></td> </tr> <tr> -<td>Search for applications by substring and display the results.</td> -<td><code>http://market.android.com/search?q=<substring></code> or -<br><code>market://search?q=<substring></code></td> -<td>Searches all public fields (application title, developer name, and -application description) for all applications. Returns exact and partial -matches.</td> +<td>Search for applications by publisher name</td> +<td><nobr><code>http://market.android.com/search?q=pub:<publisher_name></code></nobr></td> +<td><nobr><code>market://search?q=pub:<publisher_name></code></nobr></td> </tr> <tr> -<td>Search using multiple query parameters and display the results.</td> -<td>Example:<p><code>http://market.android.com/search?q=world pname:com.android.hello pub:Android</code></p></td> -<td>Returns a list of applications meeting all the supplied parameters. </td> +<td>Search for an application by its fully qualified package name</td> +<td><code>http://market.android.com/search?q=pname:<package_name></code></td> +<td><code>market://search?q=pname:<package_name></code></td> </tr> + </table> + diff --git a/docs/html/sdk/preview/features.jd b/docs/html/sdk/preview/features.jd index cd0dea12405b..d7ecc47ce8f4 100644 --- a/docs/html/sdk/preview/features.jd +++ b/docs/html/sdk/preview/features.jd @@ -1,186 +1,8 @@ -page.title=Introduction to Honeycomb @jd:body -<p>Welcome to the Honeycomb preview SDK. Honeycomb is the next major release of the Android -platform and is optimized for tablet devices. This document provides an introduction to the new -platform features and APIs available in Honeycomb.</p> - - -<h2>Fragments</h2> - -<div class="figure" style="width:400px"> - <img src="{@docRoot}images/preview_hc/fragments_layout.png" alt="" /> - <p class="img-caption"><strong>Fragment Layout.</strong> An activity with two -fragments: one with a list view, on the left, and one that displays selected content on the -right. This demo is available in the samples package.</p> -</div> - - -<p>A new framework component that allows you to separate distinct elements of an activity into -self-contained modules that define their own UI and lifecycle—defining what may be -considered "sub-activities".</p> -<ul> - <li>Multiple fragments can be combined in a single activity to build a multi-pane UI in which -each pane manages its own lifecycle and user inputs</li> - <li>Fragments are self-contained and can be reused in multiple activities</li> - <li>Fragments can be added, removed, replaced and animated inside the activity</li> - <li>Fragment can be added to a back stack managed by the activity, preserving the state of -fragments as they are changed and allowing the user to navigate backward through the different -states</li> - <li>By <a -href="{@docRoot}guide/topics/resources/providing-resources.html#AlternativeResources">providing -alternative resources</a>, you can mix and match fragments, based -on the screen size and orientation</li> - <li>Fragments have direct access to their container activity and can contribute items to the -activity's Options Menu</li> -</ul> - -<p>For more information, see the <a -href="{@docRoot}guide/topics/fragments/index.html">Fragments</a> developer guide.</p> - - -<h2>Action Bar</h2> - -<p>A replacement for the traditional title bar, which provides users quick access to global -actions and different navigation modes.</p> -<ul> - <li>Provides quick access to items from the Options Menu ("action items") and interactive -widgets ("action views")</li> - <li>Includes the application logo in the left corner, which can perform actions when tapped -and can be replaced with a custom logo</li> - <li>Provides breadcumbs for navigating backward through fragments</li> - <li>Offers built in navigation modes, including tabs and a drop-down list</li> - <li>Can be customized with themes and custom backgrounds</li> - <li>And more</li> -</ul> - -<img src="{@docRoot}images/preview_hc/actionbar.png" alt="" /> -<p class="img-caption"><strong>Action Bar.</strong> An action bar with a custom logo, -tabs, and Options Menu. This demo is available in the samples package.</p> - -<p>For more information, see the <a -href="{@docRoot}guide/topics/ui/actionbar.html">Action Bar</a> developer guide.</p> - - -<h2>System Clipboard</h2> - -<p>Applications can copy and paste data (beyond mere text) to and from the system-wide -clipboard.</p> - -<ul> - <li>Clipped data can be plain text, a URI, or an intent</li> - <li>The new {@link android.content.ClipData} class represents a complex data type for the -clipboard</li> - <li>The new {@link android.content.ClipboardManager} class allows apps to add {@link -android.content.ClipData} to the clipboard (copy) and read {@link -android.content.ClipData} from the clipboard (paste)</li> - <li>The {@link android.content.ContentProvider} class has been extended to generate byte -streams based on data types added to the clipboard and point to data hosted in a -content provider</li> -</ul> - -<p>See {@link android.content.ClipData} and {@link android.content.ClipboardManager} -for more information. You can also see an example implementation of copy/paste in an updated -version of the NotePad application (available in the samples package).</p> - - -<h2>Drag and Drop</h2> - -<p>New APIs to perform drag and drop operations, leveraging the system clipboard APIs to -transport data.</p> - -<ul> - <li>Any {@link android.view.View} can be used for a drag and drop event and a thumbnail of that -view is generated and used during the drag</li> - <li>{@link android.view.ViewGroup}s that can receive the object are notified during hover and drop -events</li> - <li>The new {@link android.view.DragEvent} class describes a drag event relating to a view, -including the item's current coordinates, the type of action (whether the drag has entered the -view, exited the view, started, dropped, etc.), and provides access to the {@link -android.content.ClipData} being carried</li> - <li>The new {@link android.view.View.OnDragListener} interface defines a callback that views -can register in order to be notified of drag events being dispatched to the view; view's can -register a drag listener with {@link android.view.View#setOnDragListener setOnDragListener()}</li> -</ul> - -<p>See {@link android.view.DragEvent} and {@link android.view.View.OnDragListener} for more -information.</p> - - -<h2>New Animations</h2> - -<p>An all new animation framework.</p> - -<ul> - <li>A flexible animation system that allows you to animate the properties of any object (View, -Drawable, Fragment, Object, anything)</li> -</ul> - -<p>See the {@link android.animation} package.</p> - - -<h2>Extended App Widgets</h2> - -<p>App widgets can now be more interactive and accept finger gestures.</p> - -<ul> - <li>The complete list of supported widgets for an app widget is now: {@link -android.widget.AnalogClock}, {@link android.widget.Button}, {@link android.widget.Chronometer}, -{@link android.widget.ImageButton}, {@link android.widget.ImageView}, {@link -android.widget.ProgressBar}, {@link android.widget.TextView}, {@link -android.widget.ViewFlipper}, {@link android.widget.AdapterViewFlipper}, {@link -android.widget.StackView}, {@link android.widget.ListView}, and {@link -android.widget.GridView}.</li> -</ul> - - -<h2>Extended Status Bar Notifications</h2> - -<p>The {@link android.app.Notification} class has been extended to support more content-rich -status bar notifications when on xlarge screens.</p> - -<ul> - <li>New {@link android.app.Notification.Builder} class helps you easily create new {@link -android.app.Notification} objects</li> - <li>Support for a title in the status bar ticker (in addition to the normal ticker text)</li> - <li>Support for a large "sender" icon in the notification—a second icon intended for -social applications to show the contact photo of the person who is the source of the -notification</li> - <li>Support for custom layouts in the status bar ticker</li> - <li>Support for buttons in the expanded notification that deliver custom intents -(such as to control ongoing music in the background)</li> -</ul> - - -<h2>Plus Android 2.3</h2> - -<p>Honeycomb includes all platform changes introduced for Android 2.3.</p> - -<p>To take full advantage of Honeycomb, you should also be aware of the new features -and APIs introduced for Android 2.3. To learn more, read the <a -href="{@docRoot}sdk/android-2.3.html">Android 2.3 release notes</a>.</p> - -<!-- -<div class="special"> -<p>To set up your preview SDK and start developing apps for Honeycomb, see the <a -href="{@docRoot}sdk/preview/installing.html">Getting Started</a> guide.</p> -</div> ---> - - - - - - - - - - - - - - - - - +<script type="text/javascript"> + document.location=toRoot+"sdk/android-3.0.html" +</script> +<p>You should have already been redirected by your browser. Please go to the +<a href="{@docRoot}sdk/android-3.0.html">Android 3.0 Platform</a>.</p>
\ No newline at end of file diff --git a/docs/html/sdk/preview/index.jd b/docs/html/sdk/preview/index.jd index edfa02b38980..ed8f7e0d5522 100644 --- a/docs/html/sdk/preview/index.jd +++ b/docs/html/sdk/preview/index.jd @@ -1,183 +1,2 @@ -page.title=Android 3.0 Preview SDK +sdk.redirect=true @jd:body - -<p>Android 3.0 is the next major release of the Android platform and is optimized for tablet -devices. We're offering a Preview SDK so you can get a head-start developing -applications for it or simply optimize your existing application for upcoming -tablets.</p> - - -<h3>What is the Preview SDK?</h3> - -<p>The Android 3.0 Preview SDK is an early look at the upcoming version of Android 3.0, for -developers only. </p> - -<p>The Preview SDK includes:</p> -<ul> - <li>An early Android 3.0 system image for use in the Android emulator</li> - <li>An Android 3.0 library with non-final APIs</li> - <li>A new WXGA emulator skin for an extra large Android Virtual Device</li> - <li>New documentation for Android 3.0, including a complete API reference, new developer guides, -and an API differences report between Android 3.0 and 2.3.</li> -</ul> - -<div class="note"> -<p><strong>Be aware that:</strong></p> -<ul> - <li>The APIs in the Preview SDK are <strong>not final</strong>. Some APIs may change in behavior -or availability when the final SDK is made available.</li> - <li>You <strong>cannot</strong> publish an application that's built against the Preview -SDK—you can only run an application built against the Preview SDK on the Android -emulator.</li> - <li>The documentation on <a href="http://developer.android.com">developer.android.com</a> -does <strong>not</strong> include the Android 3.0 documentation—to read the API reference and -developer guides for Android 3.0, you must install the Android 3.0 Preview documentation from -the AVD and SDK Manager.</li> -</ul> -</div> - - -<p><b>About emulator performance</b></p> - -<p>Because the Android emulator must simulate the ARM instruction set architecture on your -computer and the WXGA screen is significantly larger than what the emulator -normally handles, emulator performance is much slower than usual. </p> - -<p>In particular, initializing the emulator can be slow and can take several -minutes, depending on your hardware. When the emulator is booting there is -limited user feedback, so please be patient and continue waiting until you see -the home screen appear. </p> - -<p>We're working hard to resolve the performance issues in the emulator and it will improve in -future releases. In the meantime, we wanted to give developers access to new APIs and an basic test -environment as early as possible. </p> - -<p>Keeping in mind that performance on the emulator does not reflect the speed or performance of -apps on actual devices running Android 3.0, developing and testing on the emulator is still an -important tool in evaluating your application's appearance and functionality on the new platform. -</p> - - - - - -<h3>What can I do with the preview?</h3> - -<p>The Preview SDK is intended for testing existing applications on the new platform and -developing new applications with new Android 3.0 APIs.</p> - -<p>If you have an existing Android application, you don't <em>have to</em> do anything. Android -applications are always forward-compatible. If your application is a good citizen of the Android -APIs, your app should work fine on devices running Android 3.0 without any additional work. However, -in order to ensure proper performance and provide users a better experience when running your -application on an Android 3.0 tablet, we recommend that you perform the following:</p> - -<ol> - <li><b>Test your application on Android 3.0</b> - <p>Simply install the Android 3.0 preview in your Android SDK, create an AVD using the -Android 3.0 system image, install your application, and run some tests.</p> - <p>As mentioned above, your application should perform as expected. You might, however, -discover that your activity layouts are less than ideal on a large screen or some other aspects -of your application don't behave the way you expect.</p> - </li> - <li><b>Inherit the new "Holographic" theme</b> - <p>Android 3.0 offers an updated set of UI widgets that are redesigned for use on larger screens -such as tablets and incorporate the new holographic theme. Your existing application can inherit -the new design simply by setting the <a -href="{@docRoot}guide/topics/manifest/uses-sdk-element.html">{@code <uses-sdk>}</a> -element's {@code android:targetSdkVersion} attribute to {@code "Honeycomb"}.</p> - <p>If you do not update the {@code android:targetSdkVersion} attribute and the {@code -android:minSdkVersion} is set to "9" or lower, then your application uses the widget designs -from Android 2.3 and does <em>not</em> inherit the holographic theme.</p> - <p>In order for your application to match the rest of the system UI, we highly recommend you -make this change to inherit the new widget styles and system theme. However, beware that doing so -might conflict with color or text designs you applied to your application based on the previous -system theme, so you should be sure to inspect your application UI when using the holographic -theme.</p> - </li> - <li><b>Provide alternative layouts for extra large screens</b> - <p>As discussed in the guide to <a -href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a>, Android -2.3 and above support the <code>xlarge</code> resource qualifier, which you should use to supply -alternative layouts for extra large screens.</p> - <p>By providing alternative layouts for some of your activities when running on extra large -screens, you can improve the user experience of your application on a tablet without using any -new APIs.</p> - <p>For example, here are some things to consider when creating a new layout for tables:</p> - <ul> - <li>Landscape layout: The "normal" orientation for tablets is usually landscape (wide), so -you should be sure that your activities offer an appropriate layout for such a wide viewing -area.</li> - <li>Button position: Consider whether the position of the most common buttons in your UI are -easily accessible while holding a tablet with two hands.</li> - </ul> - <p class="note"><strong>Note:</strong> You can add alternative resources for <em>xlarge</em> -screens without changing your {@code minSdkVersion}. For example, if you add alternative layouts in -<code>res/layout-xlarge/</code> and your application is compatible with older versions, such -as Android 1.5—which doesn't support <em>xlarge</em> screens—this layout directory is -simply ignored by those devices.</p> - </li> -</ol> - - -<p>Otherwise, if you want to develop a new application or upgrade your existing application to -use APIs added in Android 3.0, we encourage you to get started by developing against the Android -3.0 preview platform. You can get started the same way as you would for any other version of -Android.</p> - - -<p>To get started—whether testing an existing application or creating a new one—follow -the procedure in the following section to install the Preview SDK.</p> - - - -<h3 id="Setup">How do I get it?</h3> - -<p>To get the Preview SDK, you can download it using the Android SDK and AVD Manager.</p> - -<p>If you're new to Android development, start by <a href="{@docRoot}sdk/index.html">downloading the -Android SDK starter package</a>.</p> - -<p><a href="{@docRoot}sdk/adding-components.html#launching">Launch the Android SDK and AVD -Manager</a> and install the following:</p> -<ul> - <li>SDK Platform Android Honeycomb Preview</li> - <li>Android SDK Tools, revision 9</li> - <li>Android SDK Platform-tools, revision 2</li> - <li>Documentation for Android 'Honeycomb' Preview</li> - <li>Samples for SDK API Honeycomb Preview</li> -</ul> - -<p class="note"><strong>Note:</strong> Be sure to install the documentation component for the -Honeycomb Preview SDK. The API reference for the Android 3.0 API is <strong>not</strong> available -online.</p> - -<p>Once you have installed these components, open your SDK directory and navigate to {@code -docs/sdk/} and open {@code index.html} in your browser. </p> - - - -<h3 id="Issues">Known issues</h3> - -<p>The following known issues occur for Android 3.0 AVDs that are loaded in the emulator:</p> - -<ul> - <li>The emulator displays a rotated portrait screen while in landscape -orientation. To view the screen correctly in landscape orientation, turn off the auto-rotate setting -in <strong>Settings > Screen > Auto-rotate screen</strong>. Then use Ctrl-F11 to rotate the -emulator.</li> - <li>You cannot take screenshots of an emulator screen. The Device Screen Capture window displays -<strong>Screen not available</strong>.</li> - <li>GPS emulation is currently not supported.</li> - <li>When rotating the emulator screen by pressing Ctrl-F11, the screen turns green momentarily, -then displays the normal interface.</li> - <li>The Dev Tools application sometimes crashes when trying to use the Package Browser -feature.</li> -</ul> - - -<div class="special"> - <p>For an overview of new features in Android 3.0, read the <a -href="{@docRoot}sdk/android-3.0-highlights.html">Platform Highlights</a>.</p> -</div> - diff --git a/docs/html/sdk/preview/installing.jd b/docs/html/sdk/preview/installing.jd index c835c49cac1a..94c6f2f9ab95 100644 --- a/docs/html/sdk/preview/installing.jd +++ b/docs/html/sdk/preview/installing.jd @@ -1,62 +1,8 @@ -page.title=Getting Started with Honeycomb @jd:body -<p>First, you need to set up your development environment with the new SDK Tools and preview -platform:</p> +<script type="text/javascript"> + document.location=toRoot+"sdk/installing.html" +</script> -<ol> - <li>Unpack the SDK Tools r8 package you've received. - <p>If you have an existing Android SDK directory, simply replace your existing {@code -tools/} directory with the one from the new package and add the {@code platform-tools/} -directory along side it (at the root of the SDK directory).</p></li> - <li>Unpack the platform package ({@code android-Froyo}) and place it in your SDK's {@code -platforms/} directory.</li> - <li>If you're using Eclipse, also update your Eclipse plugin using the provided archive file. - <ol> - <li>Select <strong>Help > Install new software</strong>.</li> - <li>Click <strong>Add</strong>.</li> - <li>Click <strong>Archive</strong>.</li> - <li>Locate and select the archive file. Click <strong>OK</strong>. - <p>Developer Tools now appear in the Available Software window and you can proceed -to install the plugin.</p> - </li> - </ol> - </li> -</ol> - -<p class="note"><strong>Note:</strong> Beginning with SDK Tools r8 (the version you've received), -the {@code adb} tool is now located in the {@code <sdk>/platform-tools/} directory (instead -of in {@code <sdk>/tools/}). Be sure to update your {@code PATH} environment variable and any -build/debugging scripts you have.</p> - - - -<h2 id="Setup">Set Up Your AVD and Application</h2> - -<p>With your SDK now set up, follow these steps to start developing an application for -Honeycomb.</p> - -<ol> - - <li>Create a new AVD targeted to "Android Froyo (Preview)" and with a custom skin resolution of -1280 x 800.</li> - - <li>Set the build target of your application to "Android Froyo (Preview)".</li> - <li>Set your manifest file's {@code <uses-sdk>} element to use {@code -android:minSdkVersion="Froyo"}. For example: -<pre> -<manifest> - <uses-sdk android:minSdkVersion="Froyo" /> - ... -</manifest> -</pre> -<p>"Froyo" is a provisional API Level for the Honeycomb release, used only during the preview -period. When the APIs are -finalized and the SDK is released publicly, you must update this with the appropriate API Level -integer.</p> -<p class="note"><strong>Note:</strong> By providing your {@code <uses-sdk>} element in the -manifest file <em>before</em> the {@code <application>} element, your application will -automatically apply the new Holographic theme.</p> -</li> - -</ol> +<p>You should have already been redirected by your browser. Please go to +<a href="{@docRoot}sdk/installing.html">Installing the SDK</a>.</p>
\ No newline at end of file diff --git a/docs/html/sdk/preview/requirements.jd b/docs/html/sdk/preview/requirements.jd index 1e6b26b9077a..b5aed80ef644 100644 --- a/docs/html/sdk/preview/requirements.jd +++ b/docs/html/sdk/preview/requirements.jd @@ -1,5 +1,8 @@ -sdk.redirect=true - @jd:body +<script type="text/javascript"> + document.location=toRoot+"sdk/requirements.html" +</script> +<p>You should have already been redirected by your browser. Please go to the +<a href="{@docRoot}sdk/requirements.html">SDK System Requirements</a>.</p>
\ No newline at end of file diff --git a/docs/html/sdk/preview/upgrading.jd b/docs/html/sdk/preview/upgrading.jd index 1e6b26b9077a..1c53bdbfe07f 100644 --- a/docs/html/sdk/preview/upgrading.jd +++ b/docs/html/sdk/preview/upgrading.jd @@ -1,5 +1,8 @@ -sdk.redirect=true - @jd:body +<script type="text/javascript"> + document.location=toRoot+"sdk/index.html" +</script> +<p>You should have already been redirected by your browser. Please go to +<a href="{@docRoot}sdk/index.html">the Android SDK</a>.</p>
\ No newline at end of file diff --git a/media/libstagefright/MP3Extractor.cpp b/media/libstagefright/MP3Extractor.cpp index eb4c68d722d6..03ce202ea516 100644 --- a/media/libstagefright/MP3Extractor.cpp +++ b/media/libstagefright/MP3Extractor.cpp @@ -39,10 +39,10 @@ namespace android { // Everything must match except for -// protection, bitrate, padding, private bits, mode extension, +// protection, bitrate, padding, private bits, mode, mode extension, // copyright bit, original bit and emphasis. // Yes ... there are things that must indeed match... -static const uint32_t kMask = 0xfffe0cc0; +static const uint32_t kMask = 0xfffe0c00; // static bool MP3Extractor::get_mp3_frame_size( diff --git a/packages/SystemUI/res/drawable-hdpi/notify_panel_clock_bg_pressed.9.png b/packages/SystemUI/res/drawable-hdpi/notify_panel_clock_bg_pressed.9.png Binary files differnew file mode 100644 index 000000000000..0c40c7394f5d --- /dev/null +++ b/packages/SystemUI/res/drawable-hdpi/notify_panel_clock_bg_pressed.9.png diff --git a/packages/SystemUI/res/drawable-mdpi/notify_panel_clock_bg_pressed.9.png b/packages/SystemUI/res/drawable-mdpi/notify_panel_clock_bg_pressed.9.png Binary files differindex 4fc6b46a767d..4fb1cf15f78b 100644 --- a/packages/SystemUI/res/drawable-mdpi/notify_panel_clock_bg_pressed.9.png +++ b/packages/SystemUI/res/drawable-mdpi/notify_panel_clock_bg_pressed.9.png diff --git a/packages/SystemUI/res/values-es-rUS/strings.xml b/packages/SystemUI/res/values-es-rUS/strings.xml index 7ec089f6ee1f..8f477c8d3ea4 100644 --- a/packages/SystemUI/res/values-es-rUS/strings.xml +++ b/packages/SystemUI/res/values-es-rUS/strings.xml @@ -19,7 +19,7 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> - <string name="app_label" msgid="7164937344850004466">"Sistema UI"</string> + <string name="app_label" msgid="7164937344850004466">"IU del sistema"</string> <string name="status_bar_clear_all_button" msgid="7774721344716731603">"Borrar"</string> <string name="status_bar_do_not_disturb_button" msgid="5812628897510997853">"No molestar"</string> <string name="status_bar_please_disturb_button" msgid="3345398298841572813">"Mostrar notificaciones"</string> |
