diff options
Diffstat (limited to 'docs/html/guide')
52 files changed, 238 insertions, 296 deletions
diff --git a/docs/html/guide/appendix/media-formats.jd b/docs/html/guide/appendix/media-formats.jd index 7c6c145..19f510a 100644 --- a/docs/html/guide/appendix/media-formats.jd +++ b/docs/html/guide/appendix/media-formats.jd @@ -1,5 +1,5 @@ page.title=Supported Media Formats -page.tags="video","audio","mpeg","mp4","m4a","mp3","3gp","3gpp","flac","wave","wav" +page.tags=video,audio,mpeg,mp4,m4a,mp3,3gp,3gpp,flac,wave,wav @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/components/activities.jd b/docs/html/guide/components/activities.jd index 3de7eea..5e6917b 100644 --- a/docs/html/guide/components/activities.jd +++ b/docs/html/guide/components/activities.jd @@ -1,5 +1,5 @@ page.title=Activities -page.tags="activity","intent" +page.tags=activity,intent @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/components/processes-and-threads.jd b/docs/html/guide/components/processes-and-threads.jd index e297205..e7ef7ba 100644 --- a/docs/html/guide/components/processes-and-threads.jd +++ b/docs/html/guide/components/processes-and-threads.jd @@ -1,5 +1,5 @@ page.title=Processes and Threads -page.tags="lifecycle","background" +page.tags=lifecycle,background @jd:body diff --git a/docs/html/guide/faq/security.jd b/docs/html/guide/faq/security.jd index 96fc7f5..8ccf21f 100644 --- a/docs/html/guide/faq/security.jd +++ b/docs/html/guide/faq/security.jd @@ -47,8 +47,7 @@ quickly and professionally to vulnerability reports from external researchers. <a name="issue" id="issue"></a><h2>I think I found a security flaw. How do I report it?</h2> -<p>You can reach the Android security team at <a -href="mailto:security@android.com">security@android.com</a>. If you like, you +<p>You can reach the Android security team at security@android.com. If you like, you can protect your message using our <a href="http://code.google.com/android/security_at_android_dot_com.txt">PGP key</a>.</p> @@ -58,6 +57,15 @@ with a detailed summary of the issue and keeping the issue confidential while users are at risk. In return, we will make sure to keep the researcher informed of our progress in issuing a fix. </p> +<p>Vulnerabilities specific to Android OEMs should be reported to the relevant +vendor. An incomplete list of Android vendor security contacts can be found below. +To be added to this list, please contact security@android.com.</p> + +<ul> + <li><a href="http://www.htc.com/www/terms/product-security/">HTC</a></li> + <li><a href="http://www.motorolasolutions.com/US-EN/About/Security%20Vulnerability">Motorola</a></li> + <li><a href="http://developer.samsung.com/notice/How-to-Use-the-Forum">Samsung</a> - m.security@samsung.com</li> +</ul> <a name="informed" id="informed"></a><h2>How can I stay informed about Android security?</h2> @@ -91,8 +99,8 @@ distributed for Android. How can I help?</h2> <p>Like any other platform, it will be possible for unethical developers to create malicious software, known as <a href="http://en.wikipedia.org/wiki/Malware">malware</a>, for Android. If you -think somebody is trying to spread malware, please let us know at <a -href="mailto:security@android.com">security@android.com</a>. Please include as +think somebody is trying to spread malware, please let us know at +security@android.com. Please include as much detail about the application as possible, with the location it is being distributed from and why you suspect it of being malicious software.</p> diff --git a/docs/html/guide/topics/admin/device-admin.jd b/docs/html/guide/topics/admin/device-admin.jd index 2d02e51..bed4b4d 100644 --- a/docs/html/guide/topics/admin/device-admin.jd +++ b/docs/html/guide/topics/admin/device-admin.jd @@ -1,5 +1,5 @@ page.title=Device Administration -page.tags="devicepolicymanager","policy","security" +page.tags=devicepolicymanager,policy,security @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/appwidgets/host.jd b/docs/html/guide/topics/appwidgets/host.jd index da7408f..169e388 100644 --- a/docs/html/guide/topics/appwidgets/host.jd +++ b/docs/html/guide/topics/appwidgets/host.jd @@ -1,5 +1,5 @@ page.title=App Widget Host -page.tags="AppWidgetHost","home screen","launcher" +page.tags=AppWidgetHost,home screen,launcher @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/appwidgets/index.jd b/docs/html/guide/topics/appwidgets/index.jd index d8ad844..a783ad1 100644 --- a/docs/html/guide/topics/appwidgets/index.jd +++ b/docs/html/guide/topics/appwidgets/index.jd @@ -1,5 +1,5 @@ page.title=App Widgets -page.tags="home","AppWidgetProvider" +page.tags=home,AppWidgetProvider @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/connectivity/bluetooth-le.jd b/docs/html/guide/topics/connectivity/bluetooth-le.jd index 449c892..5c32e56 100644 --- a/docs/html/guide/topics/connectivity/bluetooth-le.jd +++ b/docs/html/guide/topics/connectivity/bluetooth-le.jd @@ -1,5 +1,5 @@ page.title=Bluetooth Low Energy -page.tags="wireless","bluetoothadapter","bluetoothdevice","BLE","BTLE" +page.tags=wireless,bluetoothadapter,bluetoothdevice,BLE,BTLE @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/connectivity/bluetooth.jd b/docs/html/guide/topics/connectivity/bluetooth.jd index b57f3e2..96008c5 100644 --- a/docs/html/guide/topics/connectivity/bluetooth.jd +++ b/docs/html/guide/topics/connectivity/bluetooth.jd @@ -1,5 +1,5 @@ page.title=Bluetooth -page.tags="wireless","bluetoothadapter","bluetoothdevice" +page.tags=wireless,bluetoothadapter,bluetoothdevice @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/connectivity/nfc/hce.jd b/docs/html/guide/topics/connectivity/nfc/hce.jd index d6efaa7..9ec1a8d 100644 --- a/docs/html/guide/topics/connectivity/nfc/hce.jd +++ b/docs/html/guide/topics/connectivity/nfc/hce.jd @@ -1,5 +1,5 @@ page.title=Host-based Card Emulation -page.tags="host card emulation", "hce","HostApduService","OffHostApduService","tap and pay" +page.tags=host card emulation,hce,HostApduService,OffHostApduService,tap and pay @jd:body diff --git a/docs/html/guide/topics/connectivity/sip.jd b/docs/html/guide/topics/connectivity/sip.jd index 526eb83..5154767 100644 --- a/docs/html/guide/topics/connectivity/sip.jd +++ b/docs/html/guide/topics/connectivity/sip.jd @@ -1,5 +1,5 @@ page.title=Session Initiation Protocol -page.tags="sipmanager","sipprofile","sipaudiocall","telephony" +page.tags=sipmanager,sipprofile,sipaudiocall,telephony @jd:body <div id="qv-wrapper"> <div id="qv"> diff --git a/docs/html/guide/topics/connectivity/wifip2p.jd b/docs/html/guide/topics/connectivity/wifip2p.jd index 7cadde1..d7e1269 100644 --- a/docs/html/guide/topics/connectivity/wifip2p.jd +++ b/docs/html/guide/topics/connectivity/wifip2p.jd @@ -1,5 +1,5 @@ page.title=Wi-Fi Peer-to-Peer -page.tags="wireless","WifiP2pManager","Wi-Fi Direct","WiFi Direct","P2P","Wi-Fi P2P","WiFi P2P" +page.tags=wireless,WifiP2pManager,Wi-Fi Direct,WiFi Direct,P2P,Wi-Fi P2P,WiFi P2P @jd:body diff --git a/docs/html/guide/topics/data/data-storage.jd b/docs/html/guide/topics/data/data-storage.jd index 4b8a647..24e7f54 100644 --- a/docs/html/guide/topics/data/data-storage.jd +++ b/docs/html/guide/topics/data/data-storage.jd @@ -1,5 +1,5 @@ page.title=Storage Options -page.tags="database","sharedpreferences","sdcard" +page.tags=database,sharedpreferences,sdcard @jd:body diff --git a/docs/html/guide/topics/data/install-location.jd b/docs/html/guide/topics/data/install-location.jd index 2ec0d5a..cc58b46 100644 --- a/docs/html/guide/topics/data/install-location.jd +++ b/docs/html/guide/topics/data/install-location.jd @@ -1,5 +1,5 @@ page.title=App Install Location -page.tags="sdcard","external" +page.tags=sdcard,external @jd:body diff --git a/docs/html/guide/topics/graphics/hardware-accel.jd b/docs/html/guide/topics/graphics/hardware-accel.jd index 54ef20c..7c957b8 100644 --- a/docs/html/guide/topics/graphics/hardware-accel.jd +++ b/docs/html/guide/topics/graphics/hardware-accel.jd @@ -263,256 +263,153 @@ changed.</li> <p>The following table describes the support level of various operations across API levels:</p> <style type="text/css"> - .tblGenFixed, .tblGeneric{font-size:15px}.tblGenFixed td {padding:0 3px;letter-spacing:0;word-spacing:0;background-color:#fff;z-index:1;border-top:0px none;border-left:0px none;border-bottom:1px solid #CCC;border-right:1px solid #CCC;} .dn {display:none} .tblGenFixed td.s0 {background-color:white;border-top:1px solid #CCC;border-left:1px solid #CCC;} .tblGenFixed td.s1 {background-color:#434343;color:#ffffff;text-align:center;border-top:1px solid #CCC;} .tblGenFixed td.s2 {background-color:#d9d9d9;color:#000000;text-align:center;} .tblGenFixed td.s3 {background-color:white;color:#000000;text-align:center;} .tblGenFixed td.s5 {background-color:#434343;color:#ffffff;text-align:left;border-left:1px solid #CCC;} .tblGenFixed td.s10 {background-color:white;font-family:courier new,monospace;color:#000000;text-align:right;border-left:1px solid #CCC;} .tblGenFixed td.g_pos {background-color:#d9d9d9;color:#6aa84f;text-align:center;} .tblGenFixed td.g_neg {background-color:#d9d9d9;color:#980000;text-align:center;} .tblGenFixed td.w_pos {background-color:white;color:#6aa84f;text-align:center;} .tblGenFixed td.w_neg {background-color:white;color:#980000;text-align:center;} + .tblGenFixed, .tblGeneric{font-size:15px}.tblGenFixed td {padding:0 3px;letter-spacing:0;word-spacing:0;background-color:#fff;z-index:1;border-top:0px none;border-left:0px none;border-bottom:1px solid #CCC;border-right:1px solid #CCC;} .dn {display:none} .tblGenFixed td.s0 {background-color:white;border-top:1px solid #CCC;border-left:1px solid #CCC;} .tblGenFixed td.s1 {background-color:#434343;color:#ffffff;text-align:center;border-top:1px solid #CCC;} .tblGenFixed td.s3 {background-color:white;color:#000000;text-align:center;} .tblGenFixed td.s5 {background-color:#434343;color:#ffffff;text-align:left;border-left:1px solid #CCC;} .tblGenFixed td.label_pos {background-color:white;font-family:courier new,monospace;color:#000000;text-align:right;border-left:1px solid #CCC;} .tblGenFixed td.label_neg {background-color:#ececec;font-family:courier new,monospace;color:#000000;text-align:right;border-left:1px solid #CCC;} .tblGenFixed td.value_pos {background-color:white;color:#000000;text-align:center;} .tblGenFixed td.value_neg {background-color:#ececec;color:#980000;text-align:center;} </style> <table border="0" cellpadding="0" cellspacing="0" class="tblGenFixed" id="tblMain"> <tbody> <tr class="rShim"> <td class="rShim" style="width:380px;"></td> - <td class="rShim" style="width:120px;"></td> - <td class="rShim" style="width:120px;"></td> - <td class="rShim" style="width:120px;"></td> - <td class="rShim" style="width:120px;"></td> + <td class="rShim" style="width:240px;"></td> </tr> <tr> - <td rowspan="2" class="s0"></td> - <td colspan="4" class="s1">API level</td> - </tr> - <tr> - <td style="display:none;"></td> - <td class="s2">< 16</td> - <td class="s3">16</td> - <td class="s2">17</td> - <td class="s3">18</td> + <td class="s0"></td> + <td class="s1">First supported API level</td> </tr> <tr> <td colspan="5" class="s5">Canvas</td> </tr> <tr> - <td class="s10">drawBitmapMesh() (colors array)</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> + <td class="label_pos">drawBitmapMesh() (colors array)</td> + <td class="value_pos">18</td> </tr> <tr> - <td class="s10">drawPicture()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">drawPicture()</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">drawPosText()</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> - <td class="g_pos">✓</td> - <td class="w_pos">✓</td> + <td class="label_pos">drawPosText()</td> + <td class="value_pos">16</td> </tr> <tr> - <td class="s10">drawTextOnPath()</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> - <td class="g_pos">✓</td> - <td class="w_pos">✓</td> + <td class="label_pos">drawTextOnPath()</td> + <td class="value_pos">16</td> </tr> <tr> - <td class="s10">drawVertices()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">drawVertices()</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">setDrawFilter()</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> - <td class="g_pos">✓</td> - <td class="w_pos">✓</td> + <td class="label_pos">setDrawFilter()</td> + <td class="value_pos">16</td> </tr> <tr> - <td class="s10">clipPath()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> + <td class="label_pos">clipPath()</td> + <td class="value_pos">18</td> </tr> <tr> - <td class="s10">clipRegion()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> + <td class="label_pos">clipRegion()</td> + <td class="value_pos">18</td> </tr> <tr> - <td class="s10">clipRect(Region.Op.XOR)</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> + <td class="label_pos">clipRect(Region.Op.XOR)</td> + <td class="value_pos">18</td> </tr> <tr> - <td class="s10">clipRect(Region.Op.Difference)</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> + <td class="label_pos">clipRect(Region.Op.Difference)</td> + <td class="value_pos">18</td> </tr> <tr> - <td class="s10">clipRect(Region.Op.ReverseDifference)</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> + <td class="label_pos">clipRect(Region.Op.ReverseDifference)</td> + <td class="value_pos">18</td> </tr> <tr> - <td class="s10">clipRect() with rotation/perspective</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> + <td class="label_pos">clipRect() with rotation/perspective</td> + <td class="value_pos">18</td> </tr> <tr> <td colspan="5" class="s5">Paint</td> </tr> <tr> - <td class="s10">setAntiAlias() (for text)</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> + <td class="label_pos">setAntiAlias() (for text)</td> + <td class="value_pos">18</td> </tr> <tr> - <td class="s10">setAntiAlias() (for lines)</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> - <td class="g_pos">✓</td> - <td class="w_pos">✓</td> + <td class="label_pos">setAntiAlias() (for lines)</td> + <td class="value_pos">16</td> </tr> <tr> - <td class="s10">setFilterBitmap()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_pos">✓</td> - <td class="w_pos">✓</td> + <td class="label_pos">setFilterBitmap()</td> + <td class="value_pos">17</td> </tr> <tr> - <td class="s10">setLinearText()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">setLinearText()</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">setMaskFilter()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">setMaskFilter()</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">setPathEffect() (for lines)</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">setPathEffect() (for lines)</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">setRasterizer()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">setRasterizer()</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">setShadowLayer() (other than text)</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">setShadowLayer() (other than text)</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">setStrokeCap() (for lines)</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> + <td class="label_pos">setStrokeCap() (for lines)</td> + <td class="value_pos">18</td> </tr> <tr> - <td class="s10">setStrokeCap() (for points)</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_pos">setStrokeCap() (for points)</td> + <td class="value_pos">19</td> </tr> <tr> - <td class="s10">setSubpixelText()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">setSubpixelText()</td> + <td class="value_neg">✗</td> </tr> <tr> <td colspan="5" class="s5">Xfermode</td> </tr> <tr> - <td class="s10">AvoidXfermode</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">AvoidXfermode</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">PixelXorXfermode</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">PixelXorXfermode</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">PorterDuff.Mode.DARKEN (framebuffer)</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">PorterDuff.Mode.DARKEN (framebuffer)</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">PorterDuff.Mode.LIGHTEN (framebuffer)</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">PorterDuff.Mode.LIGHTEN (framebuffer)</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">PorterDuff.Mode.OVERLAY (framebuffer)</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">PorterDuff.Mode.OVERLAY (framebuffer)</td> + <td class="value_neg">✗</td> </tr> <tr> <td colspan="5" class="s5">Shader</td> </tr> <tr> - <td class="s10">ComposeShader inside ComposeShader</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">ComposeShader inside ComposeShader</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">Same type shaders inside ComposeShader</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> + <td class="label_neg">Same type shaders inside ComposeShader</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">Local matrix on ComposeShader</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> + <td class="label_pos">Local matrix on ComposeShader</td> + <td class="value_pos">18</td> </tr> </tbody> </table> @@ -530,64 +427,39 @@ changed.</li> <tbody> <tr class="rShim"> <td class="rShim" style="width:380px;"></td> - <td class="rShim" style="width:120px;"></td> - <td class="rShim" style="width:120px;"></td> - <td class="rShim" style="width:120px;"></td> - </tr> - <tr> - <td rowspan="2" class="s0"></td> - <td colspan="4" class="s1">API level</td> - </tr> - <tr> - <td style="display:none;"></td> - <td class="s2">< 17</td> - <td class="s3">17</td> - <td class="s2">18</td> + <td class="rShim" style="width:240px;"></td> </tr> <tr> - <td colspan="5" class="s5">Support for large scale factors</td> + <td class="s5">Drawing operation to be scaled</td> + <td class="s1">First supported API level</td> </tr> <tr> - <td class="s10">drawText()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_pos">✓</td> + <td class="label_pos">drawText()</td> + <td class="value_pos">18</td> </tr> <tr> - <td class="s10">drawPosText()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> + <td class="label_neg">drawPosText()</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">drawTextOnPath()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> + <td class="label_neg">drawTextOnPath()</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">Simple Shapes*</td> - <td class="g_neg">✗</td> - <td class="w_pos">✓</td> - <td class="g_pos">✓</td> + <td class="label_pos">Simple Shapes*</td> + <td class="value_pos">17</td> </tr> <tr> - <td class="s10">Complex Shapes*</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> + <td class="label_neg">Complex Shapes*</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">drawPath()</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> + <td class="label_neg">drawPath()</td> + <td class="value_neg">✗</td> </tr> <tr> - <td class="s10">Shadow layer</td> - <td class="g_neg">✗</td> - <td class="w_neg">✗</td> - <td class="g_neg">✗</td> + <td class="label_neg">Shadow layer</td> + <td class="value_neg">✗</td> </tr> </tbody> </table> diff --git a/docs/html/guide/topics/graphics/opengl.jd b/docs/html/guide/topics/graphics/opengl.jd index f46113d..3e3d569 100644 --- a/docs/html/guide/topics/graphics/opengl.jd +++ b/docs/html/guide/topics/graphics/opengl.jd @@ -1,5 +1,5 @@ page.title=OpenGL ES -page.tags="games" +page.tags=games @jd:body <div id="qv-wrapper"> @@ -33,14 +33,6 @@ page.tags="games" <li>{@link android.opengl.GLSurfaceView}</li> <li>{@link android.opengl.GLSurfaceView.Renderer}</li> </ol> - <h2>Related samples</h2> - <ol> - <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/GLSurfaceViewActivity.html">GLSurfaceViewActivity</a></li> - <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/GLES20Activity.html">GLES20Activity</a></li> - <li><a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/TouchRotateActivity.html">TouchRotateActivity</a></li> - <li><a -href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics/CompressedTextureActivity.html">Compressed Textures</a></li> - </ol> <h2>See also</h2> <ol> <li><a href="{@docRoot}training/graphics/opengl/index.html"> @@ -54,7 +46,8 @@ href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/graphics </div> <p>Android includes support for high performance 2D and 3D graphics with the Open Graphics Library -(OpenGL®), specifically, the OpenGL ES API. OpenGL is a cross-platform graphics API that specifies a +(OpenGL®), specifically, the OpenGL ES API. OpenGL is a cross-platform graphics API that +specifies a standard software interface for 3D graphics processing hardware. OpenGL ES is a flavor of the OpenGL specification intended for embedded devices. Android supports several versions of the OpenGL ES API:</p> @@ -65,6 +58,8 @@ API:</p> </li> <li>OpenGL ES 3.0 - This API specification is supported by Android 4.3 (API level 18) and higher. </li> + <li>OpenGL ES 3.1 - This API specification is supported by Android 5.0 (API level 21) and higher. + </li> </ul> <p class="caution"><strong>Caution:</strong> @@ -176,10 +171,18 @@ calling OpenGL APIs using the following classes:</p> interface to OpenGL ES 2.0 and is available starting with Android 2.2 (API level 8).</li> </ul> </li> - <li>OpenGL ES 3.0 API Class + </li> + <li>OpenGL ES 3.0/3.1 API Packages <ul> - <li>{@link android.opengl.GLES30 android.opengl.GLES30} - This package provides the - interface to OpenGL ES 3.0 and is available starting with Android 4.3 (API level 18).</li> + <li>{@link android.opengl} - This package provides the interface to the OpenGL ES 3.0/3.1 +classes. + Version 3.0 is available starting with Android 4.3 (API level 18). Version 3.1 is available +starting with Android 5.0 (API level 21). + <ul> + <li>{@link android.opengl.GLES30}</li> + <li>{@link android.opengl.GLES31} </li> + <li>{@link android.opengl.GLES31Ext} (<a href="#aep">Android Extension Pack</a>)</li> + </ul> </ul> </li> </ul> @@ -196,9 +199,12 @@ href="{@docRoot}guide/topics/manifest/manifest-intro.html">AndroidManifest.xml</ Here are the most common OpenGL manifest declarations:</p> <ul> - <li><strong>OpenGL ES version requirements</strong> - If your application only supports OpenGL ES -2.0, you must declare that requirement by adding the following settings to your manifest as -shown below. + <li><strong>OpenGL ES version requirements</strong> - If your application requires a specific +version of + OpenGL ES, you must declare that requirement by adding the following settings to your manifest as +shown below.</li> + +<p>For OpenGL ES 2.0:</p> <pre> <!-- Tell the system this app requires OpenGL ES 2.0. --> @@ -209,16 +215,25 @@ shown below. installed on devices that do not support OpenGL ES 2.0. If your application is exclusively for devices that support OpenGL ES 3.0, you can also specify this in your manifest:</p> +<p>For OpenGL ES 3.0:</p> + <pre> <!-- Tell the system this app requires OpenGL ES 3.0. --> <uses-feature android:glEsVersion="0x00030000" android:required="true" /> </pre> +<p>For OpenGL ES 3.1:</p> + +<pre> +<!-- Tell the system this app requires OpenGL ES 3.1. --> +<uses-feature android:glEsVersion="0x00030001" android:required="true" /> +</pre> + <p class="note"><strong>Note:</strong> - The OpenGL ES 3.0 API is backwards-compatible with the 2.0 API, which means you can be more + The OpenGL ES 3.x API is backwards-compatible with the 2.0 API, which means you can be more flexible with your implementation of OpenGL ES in your application. By declaring the OpenGL ES 2.0 API as a requirement in your manifest, you can use that API version as a default, check - for the availability of the 3.0 API at run time and then use OpenGL ES 3.0 features if the + for the availability of the 3.x API at run time and then use OpenGL ES 3.x features if the device supports it. For more information about checking the OpenGL ES version supported by a device, see <a href="#version-check">Checking OpenGL ES Version</a>. </p> @@ -414,7 +429,8 @@ public void onDrawFrame(GL10 unused) { </li> </ol> <p>For a complete example of how to apply projection and camera view with OpenGL ES 2.0, see the <a -href="{@docRoot}training/graphics/opengl/index.html">Displaying Graphics with OpenGL ES</a> class.</p> +href="{@docRoot}training/graphics/opengl/index.html">Displaying Graphics with OpenGL ES</a> +class.</p> <h2 id="faces-winding">Shape Faces and Winding</h2> @@ -585,10 +601,47 @@ supported.</p> device.</li> </ol> +<h4 id="aep">Android Extension Pack (AEP)</h4> + +<p> The AEP ensures that your application supports a standardized set of OpenGL extensions above +and beyond +the core set described in the OpenGL 3.1 specification. Packaging these extensions together +encourages a consistent set of functionality across devices, while allowing developers to take full +advantage of the latest crop of mobile GPU devices.</p> + +<p>The AEP also improves support for images, shader storage buffers, and atomic counters in +fragment shaders.</p> + +<p>For your app to be able to use the AEP, the app's manifest must declare that the AEP is required. +In addition, the platform version must support it. </p> + +<p>Declare the AEP requirement in the manifest as follows:</p> + +<pre> +<uses feature android:name="android.hardware.opengles.aep" + android:required="true" /> +</pre> + +<p>To verify that the platform version supports the AEP, use the +{@link android.content.pm.PackageManager#hasSystemFeature} method, passing in +{@link android.content.pm.PackageManager#FEATURE_OPENGLES_EXTENSION_PACK} as the argument. The following code snippet +shows an example of how to do so:</p> + +<pre> +boolean deviceSupportsAEP = getPackageManager().hasSystemFeature + (PackageManager.FEATURE_OPENGLES_EXTENSION_PACK); +</pre> + +<p>If the method returns true, AEP is supported.<p> + +<p>For more information about the AEP, visit its page at the <a +href="https://www.khronos.org/registry/gles/extensions/ANDROID/ANDROID_extension_pack_es31a.txt"> +Khronos OpenGL ES Registry</a>. + -<h3 id="version-check">Checking OpenGL ES Version</h3> +<h3 id="version-check">Checking the OpenGL ES Version</h3> -<p>There are several versions of the OpenGL ES available on Android devices. You can specify the +<p>There are several versions of OpenGL ES available on Android devices. You can specify the minimum version of the API your application requires in your <a href="#manifest">manifest</a>, but you may also want to take advantage of features in a newer API at the same time. For example, the OpenGL ES 3.0 API is backward-compatible with the 2.0 version of the API, so you may want to @@ -600,7 +653,7 @@ application manifest, your application should check the version of the API avail You can do this in one of two ways:</p> <ol> - <li>Attempt create the higher-level OpenGL ES context ({@link android.opengl.EGLContext}) and + <li>Attempt to create the higher-level OpenGL ES context ({@link android.opengl.EGLContext}) and check the result.</li> <li>Create a minimum-supported OpenGL ES context and check the version value.</li> </ol> diff --git a/docs/html/guide/topics/graphics/prop-animation.jd b/docs/html/guide/topics/graphics/prop-animation.jd index 22bf769..e455496 100644 --- a/docs/html/guide/topics/graphics/prop-animation.jd +++ b/docs/html/guide/topics/graphics/prop-animation.jd @@ -1,5 +1,5 @@ page.title=Property Animation -page.tags="valueanimator","objectanimator","layouttransition","ViewPropertyAnimator" +page.tags=valueanimator,objectanimator,layouttransition,ViewPropertyAnimator @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/manifest/activity-element.jd b/docs/html/guide/topics/manifest/activity-element.jd index 3c623f6..f0e93b9 100644 --- a/docs/html/guide/topics/manifest/activity-element.jd +++ b/docs/html/guide/topics/manifest/activity-element.jd @@ -608,7 +608,7 @@ This attribute was introduced in API Level 3. <a href="#nm"><code>android:name</code></a> attribute. <p>The system reads this attribute to determine which activity should be started when - the use presses the Up button in the action bar. The system can also use this information to + the user presses the Up button in the action bar. The system can also use this information to synthesize a back stack of activities with {@link android.app.TaskStackBuilder}.</p> <p>To support API levels 4 - 16, you can also declare the parent activity with a {@code diff --git a/docs/html/guide/topics/manifest/application-element.jd b/docs/html/guide/topics/manifest/application-element.jd index 28deed9..33f6bce 100644 --- a/docs/html/guide/topics/manifest/application-element.jd +++ b/docs/html/guide/topics/manifest/application-element.jd @@ -81,7 +81,7 @@ information. </p></dd> -<dt><a name="allowbackup"></a>{@code android:allowbackup}</dt> +<dt><a name="allowbackup"></a>{@code android:allowBackup}</dt> <dd>Whether to allow the application to participate in the backup and restore infrastructure. If this attribute is set to false, no backup or restore of the application will ever be performed, even by a full-system diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index ca954fe..a716bf8 100644 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -1,5 +1,5 @@ page.title=<uses-feature> -page.tags="filtering","features","google play filters","permissions" +page.tags=filtering,features,google play filters,permissions @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd index b372592..79a37f0 100644 --- a/docs/html/guide/topics/manifest/uses-sdk-element.jd +++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd @@ -1,5 +1,5 @@ page.title=<uses-sdk> -page.tags="api levels","sdk version","minsdkversion","targetsdkversion","maxsdkversion" +page.tags=api levels,sdk version,minsdkversion,targetsdkversion,maxsdkversion @jd:body diff --git a/docs/html/guide/topics/media/audio-capture.jd b/docs/html/guide/topics/media/audio-capture.jd index 44c618f..8e60c8f 100644 --- a/docs/html/guide/topics/media/audio-capture.jd +++ b/docs/html/guide/topics/media/audio-capture.jd @@ -1,5 +1,5 @@ page.title=Audio Capture -page.tags="mediarecorder" +page.tags=mediarecorder @jd:body <div id="qv-wrapper"> @@ -249,4 +249,4 @@ public class AudioRecordTest extends Activity } } } -</pre>
\ No newline at end of file +</pre> diff --git a/docs/html/guide/topics/media/camera.jd b/docs/html/guide/topics/media/camera.jd index e48109a..8b79b23 100644 --- a/docs/html/guide/topics/media/camera.jd +++ b/docs/html/guide/topics/media/camera.jd @@ -1,5 +1,5 @@ page.title=Camera -page.tags="photo","video","picture","mediarecorder" +page.tags=photo,video,picture,mediarecorder @jd:body <div id="qv-wrapper"> @@ -86,14 +86,17 @@ see how to implement these options.</li> <h2 id="basics">The Basics</h2> <p>The Android framework supports capturing images and video through the -{@link android.hardware.Camera} API or camera {@link android.content.Intent}. Here are the relevant +{@link android.hardware.camera2} API or camera {@link android.content.Intent}. Here are the relevant classes:</p> <dl> - <dt>{@link android.hardware.Camera}</dt> - <dd>This class is the primary API for controlling device cameras. This class is used to take + <dt>{@link android.hardware.camera2}</dt> + <dd>This package is the primary API for controlling device cameras. It can be used to take pictures or videos when you are building a camera application.</dd> + <dt>{@link android.hardware.Camera}</dt> + <dd>This class is the older deprecated API for controlling device cameras.</dd> + <dt>{@link android.view.SurfaceView}</dt> <dd>This class is used to present a live camera preview to the user.</dd> @@ -354,6 +357,10 @@ application or provides special features. Creating a customized camera activity code than <a href="#intents">using an intent</a>, but it can provide a more compelling experience for your users.</p> +<p><strong> Note: The following guide is for the older, deprecated {@link android.hardware.Camera} +API. For new or advanced camera applications, the newer {@link android.hardware.camera2} API is +recommended.</strong></p> + <p>The general steps for creating a custom camera interface for your application are as follows:</p> <ul> diff --git a/docs/html/guide/topics/media/mediaplayer.jd b/docs/html/guide/topics/media/mediaplayer.jd index dc789d2..6d03af6 100644 --- a/docs/html/guide/topics/media/mediaplayer.jd +++ b/docs/html/guide/topics/media/mediaplayer.jd @@ -1,5 +1,5 @@ page.title=Media Playback -page.tags="mediaplayer","soundpool","audiomanager" +page.tags=mediaplayer,soundpool,audiomanager @jd:body <div id="qv-wrapper"> @@ -743,4 +743,4 @@ mMediaPlayer.setAudioStreamType(AudioManager.STREAM_MUSIC); mMediaPlayer.setDataSource(getApplicationContext(), contentUri); // ...prepare and start... -</pre>
\ No newline at end of file +</pre> diff --git a/docs/html/guide/topics/renderscript/compute.jd b/docs/html/guide/topics/renderscript/compute.jd index 100894c..2e7ce56 100644 --- a/docs/html/guide/topics/renderscript/compute.jd +++ b/docs/html/guide/topics/renderscript/compute.jd @@ -56,7 +56,9 @@ contain:</p> RenderScript kernel language used in this script. Currently, 1 is the only valid value.</li> <li>A pragma declaration (<code>#pragma rs java_package_name(com.example.app)</code>) that -declares the package name of the Java classes reflected from this script.</li> +declares the package name of the Java classes reflected from this script. +Note that your .rs file must be part of your application package, and not in a +library project.</li> <li>Some number of invokable functions. An invokable function is a single-threaded RenderScript function that you can call from your Java code with arbitrary arguments. These are often useful for diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd index dee28fe..06bd2d0 100644 --- a/docs/html/guide/topics/resources/drawable-resource.jd +++ b/docs/html/guide/topics/resources/drawable-resource.jd @@ -67,7 +67,7 @@ android:drawable="@color/green"}).</p> <h2 id="Bitmap">Bitmap</h2> -<p>A bitmap image. Android supports bitmap files in a three formats: +<p>A bitmap image. Android supports bitmap files in three formats: {@code .png} (preferred), {@code .jpg} (acceptable), {@code .gif} (discouraged).</p> <p>You can reference a bitmap file directly, using the filename as the resource ID, or create an diff --git a/docs/html/guide/topics/resources/runtime-changes.jd b/docs/html/guide/topics/resources/runtime-changes.jd index d074873..0e03fe0 100644 --- a/docs/html/guide/topics/resources/runtime-changes.jd +++ b/docs/html/guide/topics/resources/runtime-changes.jd @@ -1,5 +1,5 @@ page.title=Handling Runtime Changes -page.tags="activity","lifecycle" +page.tags=activity,lifecycle @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/search/adding-custom-suggestions.jd b/docs/html/guide/topics/search/adding-custom-suggestions.jd index 47ad2fe..6ebef08 100644 --- a/docs/html/guide/topics/search/adding-custom-suggestions.jd +++ b/docs/html/guide/topics/search/adding-custom-suggestions.jd @@ -1,5 +1,5 @@ page.title=Adding Custom Suggestions -page.tags="SearchRecentSuggestionsProvider", +page.tags=SearchRecentSuggestionsProvider, @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/search/adding-recent-query-suggestions.jd b/docs/html/guide/topics/search/adding-recent-query-suggestions.jd index c1d59d4..e1020dd 100644 --- a/docs/html/guide/topics/search/adding-recent-query-suggestions.jd +++ b/docs/html/guide/topics/search/adding-recent-query-suggestions.jd @@ -1,5 +1,5 @@ page.title=Adding Recent Query Suggestions -page.tags="SearchRecentSuggestions","SearchRecentSuggestionsProvider" +page.tags=SearchRecentSuggestions,SearchRecentSuggestionsProvider @jd:body diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd index fc722b2..fcaaed3 100644 --- a/docs/html/guide/topics/search/search-dialog.jd +++ b/docs/html/guide/topics/search/search-dialog.jd @@ -1,5 +1,5 @@ page.title=Creating a Search Interface -page.tags="searchview" +page.tags=searchview @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/sensors/index.jd b/docs/html/guide/topics/sensors/index.jd index 65560e6..09d27e7 100644 --- a/docs/html/guide/topics/sensors/index.jd +++ b/docs/html/guide/topics/sensors/index.jd @@ -1,6 +1,6 @@ page.title=Location and Sensors APIs page.landing=true -page.tags="location","sensors" +page.tags=location,sensors page.landing.intro=Use sensors on the device to add rich location and motion capabilities to your app, from GPS or network location to accelerometer, gyroscope, temperature, barometer, and more. page.landing.image= @@ -38,4 +38,4 @@ practices.</p> </a> </div> -</div>
\ No newline at end of file +</div> diff --git a/docs/html/guide/topics/sensors/sensors_motion.jd b/docs/html/guide/topics/sensors/sensors_motion.jd index 945f8a6..393c3c5 100644 --- a/docs/html/guide/topics/sensors/sensors_motion.jd +++ b/docs/html/guide/topics/sensors/sensors_motion.jd @@ -1,5 +1,6 @@ page.title=Motion Sensors -page.tags="sensorevent","accelerometer","gyroscope","gravity","rotation","stepcounter" +page.tags=sensorevent,accelerometer,gyroscope,gravity,rotation,stepcounter + @jd:body <div id="qv-wrapper"> @@ -530,7 +531,6 @@ The sample application is located in the API Demos code (<a href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/os/RotationVectorDemo.html"> OS - RotationVectorDemo</a>).</p> - <h2 id="sensors-motion-significant">Using the Significant Motion Sensor</h2> <p>The significant motion sensor triggers an event each time significant motion is detected and diff --git a/docs/html/guide/topics/sensors/sensors_position.jd b/docs/html/guide/topics/sensors/sensors_position.jd index f021afe..d0ddead 100644 --- a/docs/html/guide/topics/sensors/sensors_position.jd +++ b/docs/html/guide/topics/sensors/sensors_position.jd @@ -1,5 +1,5 @@ page.title=Position Sensors -page.tags="sensorevent","orientation","proximity" +page.tags=sensorevent,orientation,proximity @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/text/copy-paste.jd b/docs/html/guide/topics/text/copy-paste.jd index b34f0fa..8f898e4 100644 --- a/docs/html/guide/topics/text/copy-paste.jd +++ b/docs/html/guide/topics/text/copy-paste.jd @@ -1,5 +1,5 @@ page.title=Copy and Paste -page.tags="clipboardmanager","clipdata","input" +page.tags=clipboardmanager,clipdata,input @jd:body <div id="qv-wrapper"> <div id="qv"> diff --git a/docs/html/guide/topics/text/creating-input-method.jd b/docs/html/guide/topics/text/creating-input-method.jd index 8b75cc8..4b6b7b7 100644 --- a/docs/html/guide/topics/text/creating-input-method.jd +++ b/docs/html/guide/topics/text/creating-input-method.jd @@ -1,5 +1,5 @@ page.title=Creating an Input Method -page.tags="ime","keyboard","inputmethodservice" +page.tags=ime,keyboard,inputmethodservice @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/text/spell-checker-framework.jd b/docs/html/guide/topics/text/spell-checker-framework.jd index 366f9cc..a5d9932 100644 --- a/docs/html/guide/topics/text/spell-checker-framework.jd +++ b/docs/html/guide/topics/text/spell-checker-framework.jd @@ -1,5 +1,5 @@ page.title=Spelling Checker Framework -page.tags="input","spellcheckerservice" +page.tags=input,spellcheckerservice @jd:body <div id="qv-wrapper"> <div id="qv"> diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd index f01d4bf..a61696a 100644 --- a/docs/html/guide/topics/ui/actionbar.jd +++ b/docs/html/guide/topics/ui/actionbar.jd @@ -1,5 +1,5 @@ page.title=Action Bar -page.tags="actionbar","menu","tabs" +page.tags=actionbar,menu,tabs @jd:body diff --git a/docs/html/guide/topics/ui/controls/button.jd b/docs/html/guide/topics/ui/controls/button.jd index cb274ae..b52c3e9 100644 --- a/docs/html/guide/topics/ui/controls/button.jd +++ b/docs/html/guide/topics/ui/controls/button.jd @@ -1,5 +1,5 @@ page.title=Buttons -page.tags="button","imagebutton" +page.tags=button,imagebutton @jd:body <div id="qv-wrapper"> @@ -241,4 +241,4 @@ the image displayed will change based on these three states.</p> <p>For more information about this XML syntax, including how to define a disabled, hovered, or other button states, read about <a href="{@docRoot}guide/topics/resources/drawable-resource.html#StateList">State List -Drawable</a>.</p>
\ No newline at end of file +Drawable</a>.</p> diff --git a/docs/html/guide/topics/ui/controls/pickers.jd b/docs/html/guide/topics/ui/controls/pickers.jd index 4c55840..31e4d3f 100644 --- a/docs/html/guide/topics/ui/controls/pickers.jd +++ b/docs/html/guide/topics/ui/controls/pickers.jd @@ -1,5 +1,5 @@ page.title=Pickers -page.tags="datepicker","timepicker" +page.tags=datepicker,timepicker @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/controls/radiobutton.jd b/docs/html/guide/topics/ui/controls/radiobutton.jd index d0c48ed..b2556e1 100644 --- a/docs/html/guide/topics/ui/controls/radiobutton.jd +++ b/docs/html/guide/topics/ui/controls/radiobutton.jd @@ -1,5 +1,5 @@ page.title=Radio Buttons -page.tags="radiobutton","radiogroup" +page.tags=radiobutton,radiogroup @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/controls/spinner.jd b/docs/html/guide/topics/ui/controls/spinner.jd index 85714b6..d2db7a4 100644 --- a/docs/html/guide/topics/ui/controls/spinner.jd +++ b/docs/html/guide/topics/ui/controls/spinner.jd @@ -1,5 +1,5 @@ page.title=Spinners -page.tags="adapterview","spinneradapter" +page.tags=adapterview,spinneradapter @jd:body <div id="qv-wrapper"> @@ -143,4 +143,4 @@ spinner.setOnItemSelectedListener(this); <p>If you implement the {@link android.widget.AdapterView.OnItemSelectedListener} interface with your {@link android.app.Activity} or {@link android.app.Fragment} (such as in the example above), you can pass -<code>this</code> as the interface instance.</p>
\ No newline at end of file +<code>this</code> as the interface instance.</p> diff --git a/docs/html/guide/topics/ui/controls/text.jd b/docs/html/guide/topics/ui/controls/text.jd index c0b9873..9474dee 100644 --- a/docs/html/guide/topics/ui/controls/text.jd +++ b/docs/html/guide/topics/ui/controls/text.jd @@ -1,5 +1,5 @@ page.title=Text Fields -page.tags="edittext","autocompletetextview" +page.tags=edittext,autocompletetextview @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/controls/togglebutton.jd b/docs/html/guide/topics/ui/controls/togglebutton.jd index 5e2a551..09af516 100644 --- a/docs/html/guide/topics/ui/controls/togglebutton.jd +++ b/docs/html/guide/topics/ui/controls/togglebutton.jd @@ -1,5 +1,5 @@ page.title=Toggle Buttons -page.tags="switch","togglebutton" +page.tags=switch,togglebutton @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/custom-components.jd b/docs/html/guide/topics/ui/custom-components.jd index 703a5ce..b146098 100644 --- a/docs/html/guide/topics/ui/custom-components.jd +++ b/docs/html/guide/topics/ui/custom-components.jd @@ -1,5 +1,5 @@ page.title=Custom Components -page.tags="view","widget" +page.tags=view,widget @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/declaring-layout.jd b/docs/html/guide/topics/ui/declaring-layout.jd index e1d51e6..ab105fd 100644 --- a/docs/html/guide/topics/ui/declaring-layout.jd +++ b/docs/html/guide/topics/ui/declaring-layout.jd @@ -1,5 +1,5 @@ page.title=Layouts -page.tags="view","viewgroup" +page.tags=view,viewgroup @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/dialogs.jd b/docs/html/guide/topics/ui/dialogs.jd index 043879c..0c6ec84 100644 --- a/docs/html/guide/topics/ui/dialogs.jd +++ b/docs/html/guide/topics/ui/dialogs.jd @@ -1,5 +1,5 @@ page.title=Dialogs -page.tags="alertdialog","dialogfragment" +page.tags=alertdialog,dialogfragment @jd:body diff --git a/docs/html/guide/topics/ui/drag-drop.jd b/docs/html/guide/topics/ui/drag-drop.jd index 9a6b0e9..9d8aa9b 100644 --- a/docs/html/guide/topics/ui/drag-drop.jd +++ b/docs/html/guide/topics/ui/drag-drop.jd @@ -1,5 +1,5 @@ page.title=Drag and Drop -page.tags="clipdata","dragevent","onlongclicklistener" +page.tags=clipdata,dragevent,onlongclicklistener @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/layout/gridview.jd b/docs/html/guide/topics/ui/layout/gridview.jd index b7dd94d..a4bf224 100644 --- a/docs/html/guide/topics/ui/layout/gridview.jd +++ b/docs/html/guide/topics/ui/layout/gridview.jd @@ -1,5 +1,5 @@ page.title=Grid View -page.tags="gridview" +page.tags=gridview @jd:body <div id="qv-wrapper"> <div id="qv"> diff --git a/docs/html/guide/topics/ui/layout/linear.jd b/docs/html/guide/topics/ui/layout/linear.jd index fb55165..f4babfe 100644 --- a/docs/html/guide/topics/ui/layout/linear.jd +++ b/docs/html/guide/topics/ui/layout/linear.jd @@ -1,5 +1,5 @@ page.title=Linear Layout -page.tags="linearlayout" +page.tags=linearlayout @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/topics/ui/layout/listview.jd b/docs/html/guide/topics/ui/layout/listview.jd index f8315c5..3c6e32c 100644 --- a/docs/html/guide/topics/ui/layout/listview.jd +++ b/docs/html/guide/topics/ui/layout/listview.jd @@ -1,5 +1,5 @@ page.title=List View -page.tags="listview" +page.tags=listview @jd:body <div id="qv-wrapper"> <div id="qv"> diff --git a/docs/html/guide/topics/ui/layout/relative.jd b/docs/html/guide/topics/ui/layout/relative.jd index 145c838..ca5cb48 100644 --- a/docs/html/guide/topics/ui/layout/relative.jd +++ b/docs/html/guide/topics/ui/layout/relative.jd @@ -1,5 +1,5 @@ page.title=Relative Layout -page.tags="relativelayout" +page.tags=relativelayout @jd:body <div id="qv-wrapper"> @@ -20,7 +20,7 @@ page.tags="relativelayout" <p>{@link android.widget.RelativeLayout} is a view group that displays child views in relative positions. The position of each view can be specified as relative to sibling elements (such as to the left-of or below another view) or in positions relative to the parent {@link -android.widget.RelativeLayout} area (such as aligned to the bottom, left of center).</p> +android.widget.RelativeLayout} area (such as aligned to the bottom, left or center).</p> <img src="{@docRoot}images/ui/relativelayout.png" alt="" /> diff --git a/docs/html/guide/topics/ui/settings.jd b/docs/html/guide/topics/ui/settings.jd index 30b7eec..f454c4e 100644 --- a/docs/html/guide/topics/ui/settings.jd +++ b/docs/html/guide/topics/ui/settings.jd @@ -1,5 +1,5 @@ page.title=Settings -page.tags="preference","preferenceactivity","preferencefragment" +page.tags=preference,preferenceactivity,preferencefragment @jd:body |