diff options
Diffstat (limited to 'docs')
169 files changed, 590 insertions, 787 deletions
diff --git a/docs/html/design/building-blocks/buttons.jd b/docs/html/design/building-blocks/buttons.jd index 8a65b82..3a34601 100644 --- a/docs/html/design/building-blocks/buttons.jd +++ b/docs/html/design/building-blocks/buttons.jd @@ -1,5 +1,5 @@ page.title=Buttons -page.tags="button","input" +page.tags=button,input @jd:body <a class="notice-developers" href="{@docRoot}guide/topics/ui/controls/button.html"> diff --git a/docs/html/design/building-blocks/dialogs.jd b/docs/html/design/building-blocks/dialogs.jd index 7cd032c..53d99b8 100644 --- a/docs/html/design/building-blocks/dialogs.jd +++ b/docs/html/design/building-blocks/dialogs.jd @@ -1,5 +1,5 @@ page.title=Dialogs -page.tags="dialog","alert","popup","toast" +page.tags=dialog,alert,popup,toast @jd:body <a class="notice-developers" href="{@docRoot}guide/topics/ui/dialogs.html"> diff --git a/docs/html/design/building-blocks/grid-lists.jd b/docs/html/design/building-blocks/grid-lists.jd index 6c9d227..d98637c 100644 --- a/docs/html/design/building-blocks/grid-lists.jd +++ b/docs/html/design/building-blocks/grid-lists.jd @@ -1,5 +1,5 @@ page.title=Grid Lists -page.tags="gridview","layout","listview" +page.tags=gridview,layout,listview @jd:body <img src="{@docRoot}design/media/gridview_overview.png"> diff --git a/docs/html/design/building-blocks/lists.jd b/docs/html/design/building-blocks/lists.jd index 0bbd08b..4949d00 100644 --- a/docs/html/design/building-blocks/lists.jd +++ b/docs/html/design/building-blocks/lists.jd @@ -1,5 +1,5 @@ page.title=Lists -page.tags="listview","layout" +page.tags=listview,layout @jd:body <a class="notice-developers" href="{@docRoot}guide/topics/ui/layout/listview.html"> diff --git a/docs/html/design/building-blocks/pickers.jd b/docs/html/design/building-blocks/pickers.jd index 9473d11..fb5e287 100644 --- a/docs/html/design/building-blocks/pickers.jd +++ b/docs/html/design/building-blocks/pickers.jd @@ -1,5 +1,5 @@ page.title=Pickers -page.tags="datepicker","timepicker" +page.tags=datepicker,timepicker @jd:body <a class="notice-developers" href="{@docRoot}guide/topics/ui/controls/pickers.html"> diff --git a/docs/html/design/building-blocks/progress.jd b/docs/html/design/building-blocks/progress.jd index 90732f4..6946a75 100644 --- a/docs/html/design/building-blocks/progress.jd +++ b/docs/html/design/building-blocks/progress.jd @@ -1,5 +1,5 @@ page.title=Progress & Activity -page.tags="progressbar","download","network" +page.tags=progressbar,download,network @jd:body <p>Progress bars and activity indicators signal to users that something is happening that will take a moment.</p> diff --git a/docs/html/design/building-blocks/scrolling.jd b/docs/html/design/building-blocks/scrolling.jd index 13b3b09..41e7cec 100644 --- a/docs/html/design/building-blocks/scrolling.jd +++ b/docs/html/design/building-blocks/scrolling.jd @@ -1,5 +1,5 @@ page.title=Scrolling -page.tags="scrollview","listview" +page.tags=scrollview,listview @jd:body <p>Scrolling allows the user to navigate to content in the overflow using a swipe gesture. The diff --git a/docs/html/design/building-blocks/seek-bars.jd b/docs/html/design/building-blocks/seek-bars.jd index 9d38e36..1465688 100644 --- a/docs/html/design/building-blocks/seek-bars.jd +++ b/docs/html/design/building-blocks/seek-bars.jd @@ -1,5 +1,5 @@ page.title=Seek Bars and Sliders -page.tags="seekbar","progressbar" +page.tags=seekbar,progressbar @jd:body <p>Interactive sliders make it possible to select a value from a continuous or discrete range of values diff --git a/docs/html/design/building-blocks/spinners.jd b/docs/html/design/building-blocks/spinners.jd index cdc933b..f7d80e7 100644 --- a/docs/html/design/building-blocks/spinners.jd +++ b/docs/html/design/building-blocks/spinners.jd @@ -1,5 +1,5 @@ page.title=Spinners -page.tags="spinner","dropdown" +page.tags=spinner,dropdown @jd:body <a class="notice-developers" href="{@docRoot}guide/topics/ui/controls/spinner.html"> diff --git a/docs/html/design/building-blocks/switches.jd b/docs/html/design/building-blocks/switches.jd index dff6c73..d435657 100644 --- a/docs/html/design/building-blocks/switches.jd +++ b/docs/html/design/building-blocks/switches.jd @@ -1,5 +1,5 @@ page.title=Switches -page.tags="switch","checkbox","radiobutton","button" +page.tags=switch,checkbox,radiobutton,button @jd:body <p>Switches allow the user to select options. There are three kinds of switches: checkboxes, radio diff --git a/docs/html/design/building-blocks/tabs.jd b/docs/html/design/building-blocks/tabs.jd index 2186b18..93818c3 100644 --- a/docs/html/design/building-blocks/tabs.jd +++ b/docs/html/design/building-blocks/tabs.jd @@ -1,5 +1,5 @@ page.title=Tabs -page.tags="tabs","actionbar","navigation","viewpager" +page.tags=tabs,actionbar,navigation,viewpager @jd:body <img src="{@docRoot}design/media/tabs_overview.png"> diff --git a/docs/html/design/building-blocks/text-fields.jd b/docs/html/design/building-blocks/text-fields.jd index 3840ca2..e109d5f 100644 --- a/docs/html/design/building-blocks/text-fields.jd +++ b/docs/html/design/building-blocks/text-fields.jd @@ -1,5 +1,5 @@ page.title=Text Fields -page.tags="text","edittext","input" +page.tags=text,edittext,input @jd:body <a class="notice-developers" href="{@docRoot}guide/topics/ui/controls/text.html"> diff --git a/docs/html/design/downloads/index.jd b/docs/html/design/downloads/index.jd index b83a2b0..1664923 100644 --- a/docs/html/design/downloads/index.jd +++ b/docs/html/design/downloads/index.jd @@ -1,5 +1,5 @@ page.title=Downloads -page tags="Icons", "stencils", "color swatches" +page.tags=Icons,stencils,color swatches @jd:body diff --git a/docs/html/design/patterns/app-structure.jd b/docs/html/design/patterns/app-structure.jd index 1447d4e..e0a11ed 100644 --- a/docs/html/design/patterns/app-structure.jd +++ b/docs/html/design/patterns/app-structure.jd @@ -1,5 +1,5 @@ page.title=App Structure -page.tags="navigation","layout","tablet" +page.tags=navigation,layout,tablet @jd:body <p>Apps come in many varieties that address very different needs. For example:</p> @@ -307,4 +307,4 @@ design guide.</p> <li> <p>Allow for quick navigation between detail items with swipe views.</p> </li> -</ul>
\ No newline at end of file +</ul> diff --git a/docs/html/design/patterns/buttons.jd b/docs/html/design/patterns/buttons.jd index 46e41c8..2d65b2d 100644 --- a/docs/html/design/patterns/buttons.jd +++ b/docs/html/design/patterns/buttons.jd @@ -1,5 +1,5 @@ page.title=Buttons -page.tags="buttons" +page.tags=buttons @jd:body <p> @@ -148,4 +148,4 @@ page.tags="buttons" Replace previous implementations of Lights Out mode with the Lean Back or Immersive approaches. Continue to use Lights Out mode for implementations of your app targeted for earlier releases. -</p>
\ No newline at end of file +</p> diff --git a/docs/html/design/patterns/confirming-acknowledging.jd b/docs/html/design/patterns/confirming-acknowledging.jd index e347231..d39d32d 100644 --- a/docs/html/design/patterns/confirming-acknowledging.jd +++ b/docs/html/design/patterns/confirming-acknowledging.jd @@ -1,5 +1,5 @@ page.title=Confirming & Acknowledging -page.tags="dialog","toast","notification" +page.tags=dialog,toast,notification @jd:body <p>In some situations, when a user invokes an action in your app, it's a good idea to <em>confirm</em> or <em>acknowledge</em> that action through text.</p> @@ -67,4 +67,4 @@ page.tags="dialog","toast","notification" <p><strong>Acknowledgment is unnecessary</strong>. The user will know the app is gone from the Home Screen because they made it disappear by dragging it away.</p> </div> -</div>
\ No newline at end of file +</div> diff --git a/docs/html/design/patterns/fullscreen.jd b/docs/html/design/patterns/fullscreen.jd index de016fe..624d44c 100644 --- a/docs/html/design/patterns/fullscreen.jd +++ b/docs/html/design/patterns/fullscreen.jd @@ -1,5 +1,5 @@ page.title=Full Screen -page.tags="full screen","immersive", "leanback" +page.tags=full screen,immersive,leanback @jd:body <p> @@ -148,4 +148,4 @@ page.tags="full screen","immersive", "leanback" Replace previous implementations of Lights Out mode with the Lean Back or Immersive approaches. Continue to use Lights Out mode for implementations of your app targeted for earlier releases. -</p>
\ No newline at end of file +</p> diff --git a/docs/html/design/patterns/gestures.jd b/docs/html/design/patterns/gestures.jd index 213902f..1ec7094 100644 --- a/docs/html/design/patterns/gestures.jd +++ b/docs/html/design/patterns/gestures.jd @@ -1,5 +1,5 @@ page.title=Gestures -page.tags="gesture","input","touch" +page.tags=gesture,input,touch @jd:body <p>Gestures allow users to interact with your app by manipulating the screen objects you provide. The diff --git a/docs/html/design/patterns/help.jd b/docs/html/design/patterns/help.jd index e47bc5a..97949e2 100644 --- a/docs/html/design/patterns/help.jd +++ b/docs/html/design/patterns/help.jd @@ -1,5 +1,5 @@ page.title=Help -page.tags="settings","preferences" +page.tags=settings,preferences @jd:body <p>We wish we could guarantee that if you follow every piece of advice on this website, everyone will be able to learn and use your app without a hitch. Sadly, that's not the case.</p> @@ -110,4 +110,4 @@ page.tags="settings","preferences" <p>People don't read help from start to finish. They scan around, looking for a piece of information containing the answer they need. Make it less burdensome with friendly formatting and layout choices like bold headings, bulleted and numbered lists, tables, and white space between paragraphs. And if you have a large amount of content, divide it into multiple screens to cut down on scrolling.</p> <h4>Take me straight to the answer</h4> -<p>What's better than a screen that's easy to scan? A screen that requires no scanning at all because the answer's right there. Consider having each screen in your app navigate to help that's relevant just to that screen. We call this <em>contextual help</em>, and it's the holy grail of user assistance. If you take this approach, be sure to also provide a way to get to the rest of the help content.</p>
\ No newline at end of file +<p>What's better than a screen that's easy to scan? A screen that requires no scanning at all because the answer's right there. Consider having each screen in your app navigate to help that's relevant just to that screen. We call this <em>contextual help</em>, and it's the holy grail of user assistance. If you take this approach, be sure to also provide a way to get to the rest of the help content.</p> diff --git a/docs/html/design/patterns/multi-pane-layouts.jd b/docs/html/design/patterns/multi-pane-layouts.jd index 08fa5bd..4e99462 100644 --- a/docs/html/design/patterns/multi-pane-layouts.jd +++ b/docs/html/design/patterns/multi-pane-layouts.jd @@ -4,6 +4,7 @@ page.metaDescription=Design guide with examples of how to flatten navigation and @jd:body + <a class="notice-developers" href="{@docRoot}training/basics/fragments/index.html"> <div> <h3>Developer Docs</h3> diff --git a/docs/html/design/patterns/navigation-drawer.jd b/docs/html/design/patterns/navigation-drawer.jd index bf6609e..7e63ba6 100644 --- a/docs/html/design/patterns/navigation-drawer.jd +++ b/docs/html/design/patterns/navigation-drawer.jd @@ -1,5 +1,5 @@ page.title=Navigation Drawer -page.tags="DrawerLayout","SlidingPaneLayout" +page.tags=DrawerLayout,SlidingPaneLayout @jd:body diff --git a/docs/html/design/patterns/new.jd b/docs/html/design/patterns/new.jd index 50cb950..d672e46 100644 --- a/docs/html/design/patterns/new.jd +++ b/docs/html/design/patterns/new.jd @@ -1,5 +1,5 @@ page.title=New in Android -page.tags="KitKat", "Android 4.4" +page.tags=KitKat,Android 4.4 @jd:body diff --git a/docs/html/design/patterns/selection.jd b/docs/html/design/patterns/selection.jd index d0ad837..be31677 100644 --- a/docs/html/design/patterns/selection.jd +++ b/docs/html/design/patterns/selection.jd @@ -1,5 +1,5 @@ page.title=Selection -page.tags="actionmode","navigation","contextual" +page.tags=actionmode,navigation,contextual @jd:body <a class="notice-developers" href="{@docRoot}guide/topics/ui/menus.html#context-menu"> diff --git a/docs/html/design/patterns/settings.jd b/docs/html/design/patterns/settings.jd index 7e0485f..e3a3f05 100644 --- a/docs/html/design/patterns/settings.jd +++ b/docs/html/design/patterns/settings.jd @@ -1,5 +1,5 @@ page.title=Settings -page.tags="preferences","sharedpreferences" +page.tags=preferences,sharedpreferences @jd:body <a class="notice-developers" href="{@docRoot}guide/topics/ui/settings.html"> @@ -696,4 +696,4 @@ it doesn't mean anything to most users and would have taken up a lot of space.</ <li><p>Use design patterns wherever applicable so users don't face a learning curve.</p></li> <li><p>Choose defaults that are safe, neutral, and fit the majority of users.</p></li> <li><p>Give each setting a clear, concise label and use secondary text appropriately.</p></li> -</ul>
\ No newline at end of file +</ul> diff --git a/docs/html/design/patterns/swipe-views.jd b/docs/html/design/patterns/swipe-views.jd index 46d6ffb8..af5c9dc 100644 --- a/docs/html/design/patterns/swipe-views.jd +++ b/docs/html/design/patterns/swipe-views.jd @@ -1,5 +1,5 @@ page.title=Swipe Views -page.tags="viewpager","navigation","tabs" +page.tags=viewpager,navigation,tabs @jd:body <a class="notice-developers" href="{@docRoot}training/implementing-navigation/lateral.html"> diff --git a/docs/html/design/style/branding.jd b/docs/html/design/style/branding.jd index 2ea4d47..2353a93 100644 --- a/docs/html/design/style/branding.jd +++ b/docs/html/design/style/branding.jd @@ -1,5 +1,5 @@ page.title=Your Branding -page.tags="branding","logo" +page.tags=branding,logo @jd:body <p>Following Android design patterns doesn't mean that your app has to look the same as diff --git a/docs/html/design/style/iconography.jd b/docs/html/design/style/iconography.jd index ec7638d..e5161f4 100644 --- a/docs/html/design/style/iconography.jd +++ b/docs/html/design/style/iconography.jd @@ -10,7 +10,7 @@ page.titleFriendly=Guidelines for creating your app's icons <p>An icon is a graphic that takes up a small portion of screen real estate and provides a quick, intuitive representation of an action, a status, or an app.</p> -<p >When you design icons for your app, it's important to keep in mind that your +<p>When you design icons for your app, it's important to keep in mind that your app may be installed on a variety of devices that offer a range of pixel densities, as mentioned in <a href="{@docRoot}design/style/devices-displays.html">Devices diff --git a/docs/html/design/style/touch-feedback.jd b/docs/html/design/style/touch-feedback.jd index 2017d8e..9f36fed 100644 --- a/docs/html/design/style/touch-feedback.jd +++ b/docs/html/design/style/touch-feedback.jd @@ -1,5 +1,5 @@ page.title=Touch Feedback -page.tags="input","button" +page.tags=input,button @jd:body <div class="layout-content-row" style="margin-bottom: -100px"> @@ -83,4 +83,4 @@ item to be removed.</p> widgets, like lists and grid lists, have support for boundary feedback built in. If you’re building custom widgets, keep boundary feedback in mind and provide it from within your app. -</p>
\ No newline at end of file +</p> diff --git a/docs/html/design/style/writing.jd b/docs/html/design/style/writing.jd index cda17eb..4f62253 100644 --- a/docs/html/design/style/writing.jd +++ b/docs/html/design/style/writing.jd @@ -1,5 +1,5 @@ page.title=Writing Style -page.tags="dialog","toast","notification" +page.tags=dialog,toast,notification @jd:body <h2 id="voa">Android's Voice</h2> @@ -319,4 +319,4 @@ will not, you will</td> ellipsis. </li> </ul> </li> -</ul>
\ No newline at end of file +</ul> diff --git a/docs/html/google/gcm/client.jd b/docs/html/google/gcm/client.jd index ec7e748..20bff10 100644 --- a/docs/html/google/gcm/client.jd +++ b/docs/html/google/gcm/client.jd @@ -1,5 +1,5 @@ page.title=Implementing GCM Client -page.tags="cloud","push","messaging" +page.tags=cloud,push,messaging @jd:body <div id="qv-wrapper"> diff --git a/docs/html/google/gcm/gs.jd b/docs/html/google/gcm/gs.jd index d357401..ae57b6d 100644 --- a/docs/html/google/gcm/gs.jd +++ b/docs/html/google/gcm/gs.jd @@ -1,5 +1,5 @@ page.title=Getting Started -page.tags="cloud","push","messaging" +page.tags=cloud,push,messaging @jd:body <div id="qv-wrapper"> diff --git a/docs/html/google/gcm/helper.jd b/docs/html/google/gcm/helper.jd index e7f2f73..19dcdc5 100644 --- a/docs/html/google/gcm/helper.jd +++ b/docs/html/google/gcm/helper.jd @@ -1,5 +1,5 @@ page.title=Using the GCM Helper Libraries -page.tags="cloud","push","messaging" +page.tags=cloud,push,messaging @jd:body <div id="deprecatedSticker"> diff --git a/docs/html/google/gcm/index.jd b/docs/html/google/gcm/index.jd index 1f05a71..56e0865 100644 --- a/docs/html/google/gcm/index.jd +++ b/docs/html/google/gcm/index.jd @@ -1,5 +1,5 @@ page.title=Google Cloud Messaging for Android -page.tags="gcm" +page.tags=gcm header.hide=1 @jd:body diff --git a/docs/html/google/play-services/ads.jd b/docs/html/google/play-services/ads.jd index 0c7b2ec..e4f0b2c 100644 --- a/docs/html/google/play-services/ads.jd +++ b/docs/html/google/play-services/ads.jd @@ -1,5 +1,5 @@ page.title=Google Mobile Ads -page.tags="Ads","monetization", "AdMob", "Google Play services" +page.tags=Ads,monetization,AdMob,Google Play services header.hide=1 @jd:body diff --git a/docs/html/google/play-services/auth.jd b/docs/html/google/play-services/auth.jd index 7acaf1c..dded599 100644 --- a/docs/html/google/play-services/auth.jd +++ b/docs/html/google/play-services/auth.jd @@ -1,5 +1,5 @@ page.title=Authorization -page.tags="AccountManager","oauth2" +page.tags=AccountManager,oauth2 @jd:body <div id="qv-wrapper"> @@ -236,4 +236,4 @@ if (serverCode == 200) { case, obtain a new token using <a href="{@docRoot}reference/com/google/android/gms/auth/GoogleAuthUtil.html#getToken(android.content.Context, java.lang.String, java.lang.String)" >{@code GoogleAuthUtil.getToken()}</a>. -</p>
\ No newline at end of file +</p> diff --git a/docs/html/google/play-services/id.jd b/docs/html/google/play-services/id.jd index d5acf76..43d1809 100644 --- a/docs/html/google/play-services/id.jd +++ b/docs/html/google/play-services/id.jd @@ -1,5 +1,5 @@ page.title=Advertising ID -page.tags="Ads","Advertising ID", "ID" +page.tags=Ads,Advertising ID,ID header.hide=1 @jd:body @@ -208,4 +208,4 @@ public void getIdThread() { } final String id = adInfo.getId(); final boolean isLAT = adInfo.isLimitAdTrackingEnabled(); -}</pre>
\ No newline at end of file +}</pre> diff --git a/docs/html/google/play-services/location.jd b/docs/html/google/play-services/location.jd index 1cdd247..3fbf00e 100644 --- a/docs/html/google/play-services/location.jd +++ b/docs/html/google/play-services/location.jd @@ -1,5 +1,5 @@ page.title=Location APIs -page.tags="location","geofence", "geofencing", "gps" +page.tags=location,geofence,geofencing,gps header.hide=1 @jd:body diff --git a/docs/html/google/play-services/maps.jd b/docs/html/google/play-services/maps.jd index 881c484..7a61d6c 100644 --- a/docs/html/google/play-services/maps.jd +++ b/docs/html/google/play-services/maps.jd @@ -1,5 +1,5 @@ page.title=Google Maps Android API v2 -page.tags="mapview","location" +page.tags=mapview,location header.hide=1 @jd:body diff --git a/docs/html/google/play-services/plus.jd b/docs/html/google/play-services/plus.jd index 95c9e0e..84224e7 100644 --- a/docs/html/google/play-services/plus.jd +++ b/docs/html/google/play-services/plus.jd @@ -1,5 +1,5 @@ page.title=Google+ Platform for Android -page.tags="authentication","signin","social" +page.tags=authentication,signin,social header.hide=1 @jd:body @@ -87,4 +87,4 @@ information about integrating Google+ into your app.</p> Google+ developer documents at <a class="external-link" href="https://developers.google.com/+/mobile/android/">developers.google.com/+</a>.</p> </div> -</div>
\ No newline at end of file +</div> diff --git a/docs/html/google/play-services/wallet.jd b/docs/html/google/play-services/wallet.jd index edd4947..e5ed514 100644 --- a/docs/html/google/play-services/wallet.jd +++ b/docs/html/google/play-services/wallet.jd @@ -1,5 +1,5 @@ page.title=Google Wallet Instant Buy for Android -page.tags="Wallet","payments","Instant Buy" +page.tags=Wallet,payments,Instant Buy header.hide=1 @jd:body @@ -84,4 +84,4 @@ header.hide=1 </div> -</div>
\ No newline at end of file +</div> diff --git a/docs/html/google/play/billing/gp-purchase-status-api.jd b/docs/html/google/play/billing/gp-purchase-status-api.jd index 23a4e61..fa0c397 100644 --- a/docs/html/google/play/billing/gp-purchase-status-api.jd +++ b/docs/html/google/play/billing/gp-purchase-status-api.jd @@ -1,6 +1,7 @@ page.title=Google Play Developer API page.tags="In-app Billing", "Google Play", "inapp billing", "in app billing", "iab", "billing", "publishing" + @jd:body <div id="qv-wrapper"> 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/nfc/nfc.jd b/docs/html/guide/topics/connectivity/nfc/nfc.jd index 5011872..19ce4d7 100644 --- a/docs/html/guide/topics/connectivity/nfc/nfc.jd +++ b/docs/html/guide/topics/connectivity/nfc/nfc.jd @@ -477,7 +477,7 @@ tag from the intent. Intents can contain the following extras depending on the t <li>{@link android.nfc.NfcAdapter#EXTRA_TAG} (required): A {@link android.nfc.Tag} object representing the scanned tag.</li> <li>{@link android.nfc.NfcAdapter#EXTRA_NDEF_MESSAGES} (optional): An array of NDEF messages -parsed from the tag. This extra is mandatory on {@link android.nfc.NfcAdapter#ACTION_NDEF_DISCOVERED +parsed from the tag. This extra is mandatory on {@link android.nfc.NfcAdapter#ACTION_NDEF_DISCOVERED} intents.</li> <li>{@link android.nfc.NfcAdapter#EXTRA_ID} (optional): The low-level ID of the tag.</li></ul> 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..d194082 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"> 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 diff --git a/docs/html/images/camera2/metadata/android.colorCorrection.mode/processing_pipeline.png b/docs/html/images/camera2/metadata/android.colorCorrection.mode/processing_pipeline.png Binary files differnew file mode 100644 index 0000000..7578b48 --- /dev/null +++ b/docs/html/images/camera2/metadata/android.colorCorrection.mode/processing_pipeline.png diff --git a/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/blue_shading.png b/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/blue_shading.png Binary files differnew file mode 100644 index 0000000..7b10f6b --- /dev/null +++ b/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/blue_shading.png diff --git a/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/green_e_shading.png b/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/green_e_shading.png Binary files differnew file mode 100644 index 0000000..41972cf --- /dev/null +++ b/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/green_e_shading.png diff --git a/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/green_o_shading.png b/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/green_o_shading.png Binary files differnew file mode 100644 index 0000000..d26600b --- /dev/null +++ b/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/green_o_shading.png diff --git a/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/inv_shading.png b/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/inv_shading.png Binary files differnew file mode 100644 index 0000000..1e7208e --- /dev/null +++ b/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/inv_shading.png diff --git a/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/red_shading.png b/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/red_shading.png Binary files differnew file mode 100644 index 0000000..ecef3ae --- /dev/null +++ b/docs/html/images/camera2/metadata/android.statistics.lensShadingMap/red_shading.png diff --git a/docs/html/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png b/docs/html/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png Binary files differnew file mode 100644 index 0000000..ec89e37 --- /dev/null +++ b/docs/html/images/camera2/metadata/android.tonemap.curveRed/gamma_tonemap.png diff --git a/docs/html/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png b/docs/html/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png Binary files differnew file mode 100644 index 0000000..cf0c63d --- /dev/null +++ b/docs/html/images/camera2/metadata/android.tonemap.curveRed/inverse_tonemap.png diff --git a/docs/html/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png b/docs/html/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png Binary files differnew file mode 100644 index 0000000..f226a54 --- /dev/null +++ b/docs/html/images/camera2/metadata/android.tonemap.curveRed/linear_tonemap.png diff --git a/docs/html/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png b/docs/html/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png Binary files differnew file mode 100644 index 0000000..ded0645 --- /dev/null +++ b/docs/html/images/camera2/metadata/android.tonemap.curveRed/srgb_tonemap.png diff --git a/docs/html/preview/license.jd b/docs/html/preview/license.jd deleted file mode 100644 index 5ff52ba..0000000 --- a/docs/html/preview/license.jd +++ /dev/null @@ -1,143 +0,0 @@ -page.title=License Agreement - -@jd:body - -<p> -To get started with the Android SDK Preview, you must agree to the following terms and conditions. -As described below, please note that this is a preview version of the Android SDK, subject to change, that you use at your own risk. The Android SDK Preview is not a stable release, and may contain errors and defects that can result in serious damage to your computer systems, devices and data. -</p> - -<p> -This is the Android SDK Preview License Agreement (the “License Agreement”). -</p> -<div class="sdk-terms" style="height:auto;border:0;padding:0;width:700px"> -1. Introduction - -1.1 The Android SDK Preview (referred to in the License Agreement as the “Preview” and specifically including the Android system files, packaged APIs, and Preview library files, if and when they are made available) is licensed to you subject to the terms of the License Agreement. The License Agreement forms a legally binding contract between you and Google in relation to your use of the Preview. - -1.2 "Android" means the Android software stack for devices, as made available under the Android Open Source Project, which is located at the following URL: http://source.android.com/, as updated from time to time. - -1.3 "Google" means Google Inc., a Delaware corporation with principal place of business at 1600 Amphitheatre Parkway, Mountain View, CA 94043, United States. - -2. Accepting the License Agreement - -2.1 In order to use the Preview, you must first agree to the License Agreement. You may not use the Preview if you do not accept the License Agreement. - -2.2 By clicking to accept and/or using the Preview, you hereby agree to the terms of the License Agreement. - -2.3 You may not use the Preview and may not accept the License Agreement if you are a person barred from receiving the Preview under the laws of the United States or other countries including the country in which you are resident or from which you use the Preview. - -2.4 If you will use the Preview internally within your company or organization you agree to be bound by the License Agreement on behalf of your employer or other entity, and you represent and warrant that you have full legal authority to bind your employer or such entity to the License Agreement. If you do not have the requisite authority, you may not accept the License Agreement or use the Preview on behalf of your employer or other entity. - -3. Preview License from Google - -3.1 Subject to the terms of the License Agreement, Google grants you a royalty-free, non-assignable, non-exclusive, non-sublicensable, limited, revocable license to use the Preview, personally or internally within your company or organization, solely to develop applications to run on the Android platform. - -3.2 You agree that Google or third parties owns all legal right, title and interest in and to the Preview, including any Intellectual Property Rights that subsist in the Preview. "Intellectual Property Rights" means any and all rights under patent law, copyright law, trade secret law, trademark law, and any and all other proprietary rights. Google reserves all rights not expressly granted to you. - -3.3 You may not use the Preview for any purpose not expressly permitted by the License Agreement. Except to the extent required by applicable third party licenses, you may not: (a) copy (except for backup purposes), modify, adapt, redistribute, decompile, reverse engineer, disassemble, or create derivative works of the Preview or any part of the Preview; or (b) load any part of the Preview onto a mobile handset or any other hardware device except a personal computer, combine any part of the Preview with other software, or distribute any software or device incorporating a part of the Preview. - -3.4 You agree that you will not take any actions that may cause or result in the fragmentation of Android, including but not limited to distributing, participating in the creation of, or promoting in any way a software development kit derived from the Preview. - -3.5 Use, reproduction and distribution of components of the Preview licensed under an open source software license are governed solely by the terms of that open source software license and not the License Agreement. You agree to remain a licensee in good standing in regard to such open source software licenses under all the rights granted and to refrain from any actions that may terminate, suspend, or breach such rights. - -3.6 You agree that the form and nature of the Preview that Google provides may change without prior notice to you and that future versions of the Preview may be incompatible with applications developed on previous versions of the Preview. You agree that Google may stop (permanently or temporarily) providing the Preview (or any features within the Preview) to you or to users generally at Google's sole discretion, without prior notice to you. - -3.7 Nothing in the License Agreement gives you a right to use any of Google's trade names, trademarks, service marks, logos, domain names, or other distinctive brand features. - -3.8 You agree that you will not remove, obscure, or alter any proprietary rights notices (including copyright and trademark notices) that may be affixed to or contained within the Preview. - -4. Use of the Preview by You - -4.1 Google agrees that nothing in the License Agreement gives Google any right, title or interest from you (or your licensors) under the License Agreement in or to any software applications that you develop using the Preview, including any intellectual property rights that subsist in those applications. - -4.2 You agree to use the Preview and write applications only for purposes that are permitted by (a) the License Agreement, and (b) any applicable law, regulation or generally accepted practices or guidelines in the relevant jurisdictions (including any laws regarding the export of data or software to and from the United States or other relevant countries). - -4.3 You agree that if you use the Preview to develop applications, you will protect the privacy and legal rights of users. If users provide you with user names, passwords, or other login information or personal information, you must make the users aware that the information will be available to your application, and you must provide legally adequate privacy notice and protection for those users. If your application stores personal or sensitive information provided by users, it must do so securely. If users provide you with Google Account information, your application may only use that information to access the user's Google Account when, and for the limited purposes for which, each user has given you permission to do so. - -4.4 You agree that you will not engage in any activity with the Preview, including the development or distribution of an application, that interferes with, disrupts, damages, or accesses in an unauthorized manner the servers, networks, or other properties or services of Google or any third party. - -4.5 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any data, content, or resources that you create, transmit or display through Android and/or applications for Android, and for the consequences of your actions (including any loss or damage which Google may suffer) by doing so. - -4.6 You agree that you are solely responsible for (and that Google has no responsibility to you or to any third party for) any breach of your obligations under the License Agreement, any applicable third party contract or Terms of Service, or any applicable law or regulation, and for the consequences (including any loss or damage which Google or any third party may suffer) of any such breach. - -4.7 The Preview is in development, and your testing and feedback are an important part of the development process. By using the Preview, you acknowledge that implementation of some features are still under development and that you should not rely on the Preview having the full functionality of a stable release. You agree not to publicly distribute or ship any application using this Preview as this Preview will no longer be supported after the official Android SDK is released. - -5. Your Developer Credentials - -5.1 You agree that you are responsible for maintaining the confidentiality of any developer credentials that may be issued to you by Google or which you may choose yourself and that you will be solely responsible for all applications that are developed under your developer credentials. - -6. Privacy and Information - -6.1 In order to continually innovate and improve the Preview, Google may collect certain usage statistics from the software including but not limited to a unique identifier, associated IP address, version number of the software, and information on which tools and/or services in the Preview are being used and how they are being used. Before any of this information is collected, the Preview will notify you and seek your consent. If you withhold consent, the information will not be collected. - -6.2 The data collected is examined in the aggregate to improve the Preview and is maintained in accordance with Google's Privacy Policy located at http://www.google.com/policies/privacy/. - -7. Third Party Applications - -7.1 If you use the Preview to run applications developed by a third party or that access data, content or resources provided by a third party, you agree that Google is not responsible for those applications, data, content, or resources. You understand that all data, content or resources which you may access through such third party applications are the sole responsibility of the person from which they originated and that Google is not liable for any loss or damage that you may experience as a result of the use or access of any of those third party applications, data, content, or resources. - -7.2 You should be aware the data, content, and resources presented to you through such a third party application may be protected by intellectual property rights which are owned by the providers (or by other persons or companies on their behalf). You may not modify, rent, lease, loan, sell, distribute or create derivative works based on these data, content, or resources (either in whole or in part) unless you have been specifically given permission to do so by the relevant owners. - -7.3 You acknowledge that your use of such third party applications, data, content, or resources may be subject to separate terms between you and the relevant third party. - -8. Using Google APIs - -8.1 Google APIs - -8.1.1 If you use any API to retrieve data from Google, you acknowledge that the data may be protected by intellectual property rights which are owned by Google or those parties that provide the data (or by other persons or companies on their behalf). Your use of any such API may be subject to additional Terms of Service. You may not modify, rent, lease, loan, sell, distribute or create derivative works based on this data (either in whole or in part) unless allowed by the relevant Terms of Service. - -8.1.2 If you use any API to retrieve a user's data from Google, you acknowledge and agree that you shall retrieve data only with the user's explicit consent and only when, and for the limited purposes for which, the user has given you permission to do so. - -9. Terminating the License Agreement - -9.1 the License Agreement will continue to apply until terminated by either you or Google as set out below. - -9.2 If you want to terminate the License Agreement, you may do so by ceasing your use of the Preview and any relevant developer credentials. - -9.3 Google may at any time, terminate the License Agreement, with or without cause, upon notice to you. - -9.4 The License Agreement will automatically terminate without notice or other action upon the earlier of: -(A) when Google ceases to provide the Preview or certain parts of the Preview to users in the country in which you are resident or from which you use the service; and -(B) Google issues a final release version of the Android SDK. - -9.5 When the License Agreement is terminated, the license granted to you in the License Agreement will terminate, you will immediately cease all use of the Preview, and the provisions of paragraphs 10, 11, 12 and 14 shall survive indefinitely. - -10. DISCLAIMERS - -10.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT YOUR USE OF THE PREVIEW IS AT YOUR SOLE RISK AND THAT THE PREVIEW IS PROVIDED "AS IS" AND "AS AVAILABLE" WITHOUT WARRANTY OF ANY KIND FROM GOOGLE. - -10.2 YOUR USE OF THE PREVIEW AND ANY MATERIAL DOWNLOADED OR OTHERWISE OBTAINED THROUGH THE USE OF THE PREVIEW IS AT YOUR OWN DISCRETION AND RISK AND YOU ARE SOLELY RESPONSIBLE FOR ANY DAMAGE TO YOUR COMPUTER SYSTEM OR OTHER DEVICE OR LOSS OF DATA THAT RESULTS FROM SUCH USE. WITHOUT LIMITING THE FOREGOING, YOU UNDERSTAND THAT THE PREVIEW IS NOT A STABLE RELEASE AND MAY CONTAIN ERRORS, DEFECTS AND SECURITY VULNERABILITIES THAT CAN RESULT IN SIGNIFICANT DAMAGE, INCLUDING THE COMPLETE, IRRECOVERABLE LOSS OF USE OF YOUR COMPUTER SYSTEM OR OTHER DEVICE. - -10.3 GOOGLE FURTHER EXPRESSLY DISCLAIMS ALL WARRANTIES AND CONDITIONS OF ANY KIND, WHETHER EXPRESS OR IMPLIED, INCLUDING, BUT NOT LIMITED TO THE IMPLIED WARRANTIES AND CONDITIONS OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. - -11. LIMITATION OF LIABILITY - -11.1 YOU EXPRESSLY UNDERSTAND AND AGREE THAT GOOGLE, ITS SUBSIDIARIES AND AFFILIATES, AND ITS LICENSORS SHALL NOT BE LIABLE TO YOU UNDER ANY THEORY OF LIABILITY FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, CONSEQUENTIAL OR EXEMPLARY DAMAGES THAT MAY BE INCURRED BY YOU, INCLUDING ANY LOSS OF DATA, WHETHER OR NOT GOOGLE OR ITS REPRESENTATIVES HAVE BEEN ADVISED OF OR SHOULD HAVE BEEN AWARE OF THE POSSIBILITY OF ANY SUCH LOSSES ARISING. - -12. Indemnification - -12.1 To the maximum extent permitted by law, you agree to defend, indemnify and hold harmless Google, its affiliates and their respective directors, officers, employees and agents from and against any and all claims, actions, suits or proceedings, as well as any and all losses, liabilities, damages, costs and expenses (including reasonable attorneys’ fees) arising out of or accruing from (a) your use of the Preview, (b) any application you develop on the Preview that infringes any Intellectual Property Rights of any person or defames any person or violates their rights of publicity or privacy, and (c) any non-compliance by you of the License Agreement. - -13. Changes to the License Agreement - -13.1 Google may make changes to the License Agreement as it distributes new versions of the Preview. When these changes are made, Google will make a new version of the License Agreement available on the website where the Preview is made available. - -14. General Legal Terms - -14.1 the License Agreement constitutes the whole legal agreement between you and Google and governs your use of the Preview (excluding any services which Google may provide to you under a separate written agreement), and completely replaces any prior agreements between you and Google in relation to the Preview. - -14.2 You agree that if Google does not exercise or enforce any legal right or remedy which is contained in the License Agreement (or which Google has the benefit of under any applicable law), this will not be taken to be a formal waiver of Google's rights and that those rights or remedies will still be available to Google. - -14.3 If any court of law, having the jurisdiction to decide on this matter, rules that any provision of the License Agreement is invalid, then that provision will be removed from the License Agreement without affecting the rest of the License Agreement. The remaining provisions of the License Agreement will continue to be valid and enforceable. - -14.4 You acknowledge and agree that each member of the group of companies of which Google is the parent shall be third party beneficiaries to the License Agreement and that such other companies shall be entitled to directly enforce, and rely upon, any provision of the License Agreement that confers a benefit on (or rights in favor of) them. Other than this, no other person or company shall be third party beneficiaries to the License Agreement. - -14.5 EXPORT RESTRICTIONS. THE PREVIEW IS SUBJECT TO UNITED STATES EXPORT LAWS AND REGULATIONS. YOU MUST COMPLY WITH ALL DOMESTIC AND INTERNATIONAL EXPORT LAWS AND REGULATIONS THAT APPLY TO THE PREVIEW. THESE LAWS INCLUDE RESTRICTIONS ON DESTINATIONS, END USERS AND END USE. - -14.6 The License Agreement may not be assigned or transferred by you without the prior written approval of Google, and any attempted assignment without such approval will be void. You shall not delegate your responsibilities or obligations under the License Agreement without the prior written approval of Google. - -14.7 The License Agreement, and your relationship with Google under the License Agreement, shall be governed by the laws of the State of California without regard to its conflict of laws provisions. You and Google agree to submit to the exclusive jurisdiction of the courts located within the county of Santa Clara, California to resolve any legal matter arising from the License Agreement. Notwithstanding this, you agree that Google shall still be allowed to apply for injunctive remedies (or an equivalent type of urgent legal relief) in any jurisdiction. - - -</div>
\ No newline at end of file diff --git a/docs/html/preview/preview_toc.cs b/docs/html/preview/preview_toc.cs index 819976e..04f966a 100644 --- a/docs/html/preview/preview_toc.cs +++ b/docs/html/preview/preview_toc.cs @@ -96,11 +96,6 @@ <a href="<?cs var:toroot ?>preview/support.html">Support</a> </div> </li> - <li class="nav-section"> - <div class="nav-section-header empty"> - <a href="<?cs var:toroot ?>preview/license.html">License Agreement</a> - </div> - </li> <li class="nav-section" style="margin: 20px 0 0 -10px;"> <div class="nav-section-header empty"> <a href="<?cs var:toroot ?>index.html" class="back-link">Developer Home</a> diff --git a/docs/html/reference/renderscript/rs__matrix_8rsh.html b/docs/html/reference/renderscript/rs__matrix_8rsh.html index 69cc373..3b8e047 100644 --- a/docs/html/reference/renderscript/rs__matrix_8rsh.html +++ b/docs/html/reference/renderscript/rs__matrix_8rsh.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/> -<title>/usr/local/google/home/srhines/android_trees/jb-mr2-dev/frameworks/rs/scriptc/rs_matrix.rsh File Reference</title> +<title>frameworks/rs/scriptc/rs_matrix.rsh File Reference</title> <link href="tabs.css" rel="stylesheet" type="text/css"/> <link href="doxygen.css" rel="stylesheet" type="text/css" /> @@ -27,18 +27,18 @@ <div class="summary"> <a href="#func-members">Functions</a> </div> <div class="headertitle"> -<div class="title">/usr/local/google/home/srhines/android_trees/jb-mr2-dev/frameworks/rs/scriptc/rs_matrix.rsh File Reference</div> </div> +<div class="title">frameworks/rs/scriptc/rs_matrix.rsh File Reference</div> </div> </div> <div class="contents"> <table class="memberdecls"> <tr><td colspan="2"><h2><a name="func-members"></a> Functions</h2></td></tr> -<tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#ad6ea242218e0f1a031f754df0317e6e7">rsMatrixSet</a> (<a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, float v)</td></tr> -<tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#ab69543f85a673f23fbb5f893e5824395">rsMatrixSet</a> (<a class="el" href="structrs__matrix3x3.html">rs_matrix3x3</a> *m, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, float v)</td></tr> -<tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a0a85c8d3607f1b75019f6991c5b19fca">rsMatrixSet</a> (<a class="el" href="structrs__matrix2x2.html">rs_matrix2x2</a> *m, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, float v)</td></tr> -<tr><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a22e983b67d3089c5cb97032e249ca335">rsMatrixGet</a> (const <a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col)</td></tr> -<tr><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#ad485084684991796cffdd8a008557569">rsMatrixGet</a> (const <a class="el" href="structrs__matrix3x3.html">rs_matrix3x3</a> *m, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col)</td></tr> -<tr><td class="memItemLeft" align="right" valign="top">float </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#aaa86b029d5c5c15fead5338bba02e4c3">rsMatrixGet</a> (const <a class="el" href="structrs__matrix2x2.html">rs_matrix2x2</a> *m, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col)</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">_RS_RUNTIME void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#aca88832ed720e301780152c60884393e">rsMatrixSet</a> (<a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, float v)</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">_RS_RUNTIME void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a08a247cdf2e70e78310bf04f9ecd5144">rsMatrixSet</a> (<a class="el" href="structrs__matrix3x3.html">rs_matrix3x3</a> *m, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, float v)</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">_RS_RUNTIME void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#af9707d7be5945bf55ed53683624176ff">rsMatrixSet</a> (<a class="el" href="structrs__matrix2x2.html">rs_matrix2x2</a> *m, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, float v)</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">_RS_RUNTIME float </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#af26fdbf8b8f0ed5d1b53f62b2aef5110">rsMatrixGet</a> (const <a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row)</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">_RS_RUNTIME float </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#acfebfc7b97e7282b78cd9c65b791932a">rsMatrixGet</a> (const <a class="el" href="structrs__matrix3x3.html">rs_matrix3x3</a> *m, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row)</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">_RS_RUNTIME float </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a683b4537b98103c50cc66780dfe8cd69">rsMatrixGet</a> (const <a class="el" href="structrs__matrix2x2.html">rs_matrix2x2</a> *m, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row)</td></tr> <tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a0ffd9de971cf10d0a663ff565be8d3cc">rsMatrixLoadIdentity</a> (<a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m)</td></tr> <tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a5b31e83553efa947db2198674d5db043">rsMatrixLoadIdentity</a> (<a class="el" href="structrs__matrix3x3.html">rs_matrix3x3</a> *m)</td></tr> <tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#ad2954a5ac11d2370227296be89e92471">rsMatrixLoadIdentity</a> (<a class="el" href="structrs__matrix2x2.html">rs_matrix2x2</a> *m)</td></tr> @@ -65,9 +65,9 @@ Functions</h2></td></tr> <tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a4c59884a0e534dbbcdc5655842732d43">rsMatrixLoadOrtho</a> (<a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m, float left, float right, float bottom, float top, float near, float far)</td></tr> <tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#ad25760aaf01e95d0055237afab41bbb3">rsMatrixLoadFrustum</a> (<a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m, float left, float right, float bottom, float top, float near, float far)</td></tr> <tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#aa404c34d7478f2921f7415d2da95d02b">rsMatrixLoadPerspective</a> (<a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m, float fovy, float aspect, float near, float far)</td></tr> -<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a2f11c3d7cc34ddce90ba785b93af8da2">rsMatrixMultiply</a> (const <a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m, <a class="el" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> in)</td></tr> -<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a88ae2ed203769cb4a7917f84f6c1a2e2">rsMatrixMultiply</a> (const <a class="el" href="structrs__matrix3x3.html">rs_matrix3x3</a> *m, <a class="el" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> in)</td></tr> -<tr><td class="memItemLeft" align="right" valign="top"><a class="el" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a8d81a7143d5d45f60f7e91f955579bab">rsMatrixMultiply</a> (const <a class="el" href="structrs__matrix2x2.html">rs_matrix2x2</a> *m, <a class="el" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in)</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">_RS_RUNTIME <a class="el" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a47b6abbf32ffaf77bb13d96c3f05779f">rsMatrixMultiply</a> (<a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m, <a class="el" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> in)</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">_RS_RUNTIME <a class="el" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a716bc2d29b80eb25388aba3ba8845aef">rsMatrixMultiply</a> (<a class="el" href="structrs__matrix3x3.html">rs_matrix3x3</a> *m, <a class="el" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> in)</td></tr> +<tr><td class="memItemLeft" align="right" valign="top">_RS_RUNTIME <a class="el" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a4d9a8bb7c3f5d67b14fa349bdd531d13">rsMatrixMultiply</a> (<a class="el" href="structrs__matrix2x2.html">rs_matrix2x2</a> *m, <a class="el" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in)</td></tr> <tr><td class="memItemLeft" align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a00b6a334ba5ac94d84850f22ec9f4de5">rsMatrixInverse</a> (<a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m)</td></tr> <tr><td class="memItemLeft" align="right" valign="top">bool </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#ac05080d52da2d99a759ef34fa0655e82">rsMatrixInverseTranspose</a> (<a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m)</td></tr> <tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a88095c70f1550c760844b3e32e41a31a">rsMatrixTranspose</a> (<a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> *m)</td></tr> @@ -75,16 +75,30 @@ Functions</h2></td></tr> <tr><td class="memItemLeft" align="right" valign="top">void </td><td class="memItemRight" valign="bottom"><a class="el" href="rs__matrix_8rsh.html#a49164dd4d4e85b212196028b1fd89dc1">rsMatrixTranspose</a> (<a class="el" href="structrs__matrix2x2.html">rs_matrix2x2</a> *m)</td></tr> </table> <hr/><a name="details" id="details"></a><h2>Detailed Description</h2> -<div class="textblock"><p>Matrix routines. </p> +<div class="textblock"><p>Matrix functions. </p> +<p>These functions let you manipulate square matrices of rank 2x2, 3x3, and 4x4. They are particularly useful for graphical transformations and are compatible with OpenGL.</p> +<p>A few general notes:</p> +<ul> +<li>We use a zero-based index for rows and columns. E.g. the last element of a <a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> is found at (3, 3).</li> +</ul> +<ul> +<li>RenderScript uses column-based vectors. Transforming a vector is done by postmultiplying the vector, e.g. <em>(matrix * vector)</em>, as provided by <a class="el" href="rs__matrix_8rsh.html#a4d9a8bb7c3f5d67b14fa349bdd531d13">rsMatrixMultiply</a>.</li> +</ul> +<ul> +<li>To create a transformation matrix that performs two transformations at once, multiply the two source matrices, with the first transformation as the right argument. E.g. to create a transformation matrix that applies the transformation <em>s1</em> followed by <em>s2</em>, call rsMatrixLoadMultiply(&combined, &s2, &s1). This derives from <em>s2 * (s1 * v)</em>, which is <em>(s2 * s1) * v</em>.</li> +</ul> +<ul> +<li>We have two style of functions to create transformation matrices: rsMatrixLoad<em>Transformation</em> and rsMatrix<em>Transformation</em>. The former style simply stores the transformation matrix in the first argument. The latter modifies a pre-existing transformation matrix so that the new transformation happens first. E.g. if you call <a class="el" href="rs__matrix_8rsh.html#a4df5f9b5bb6044f3c3426f2f58b94405">rsMatrixTranslate</a> on a matrix that already does a scaling, the resulting matrix when applied to a vector will first do the translation then the scaling. </li> +</ul> <p>Definition in file <a class="el" href="rs__matrix_8rsh_source.html">rs_matrix.rsh</a>.</p> </div><hr/><h2>Function Documentation</h2> -<a class="anchor" id="a22e983b67d3089c5cb97032e249ca335"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixGet" ref="a22e983b67d3089c5cb97032e249ca335" args="(const rs_matrix4x4 *m, uint32_t row, uint32_t col)" --> +<a class="anchor" id="af26fdbf8b8f0ed5d1b53f62b2aef5110"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixGet" ref="af26fdbf8b8f0ed5d1b53f62b2aef5110" args="(const rs_matrix4x4 *m, uint32_t col, uint32_t row)" --> <div class="memitem"> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">float rsMatrixGet </td> + <td class="memname">_RS_RUNTIME float rsMatrixGet </td> <td>(</td> <td class="paramtype">const <a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> * </td> <td class="paramname"><em>m</em>, </td> @@ -93,13 +107,13 @@ Functions</h2></td></tr> <td class="paramkey"></td> <td></td> <td class="paramtype"><a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> </td> - <td class="paramname"><em>row</em>, </td> + <td class="paramname"><em>col</em>, </td> </tr> <tr> <td class="paramkey"></td> <td></td> <td class="paramtype"><a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> </td> - <td class="paramname"><em>col</em> </td> + <td class="paramname"><em>row</em> </td> </tr> <tr> <td></td> @@ -109,25 +123,26 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Get one element of a matrix.</p> +<p>Returns one element of a matrix.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td>The matrix to read from </td></tr> - <tr><td class="paramname">row</td><td></td></tr> - <tr><td class="paramname">col</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to extract the element from. </td></tr> + <tr><td class="paramname">col</td><td>The zero-based column of the element to be extracted. </td></tr> + <tr><td class="paramname">row</td><td>The zero-based row of the element to extracted.</td></tr> </table> </dd> </dl> +<dl class="warning"><dt><b>Warning:</b></dt><dd>The order of the column and row parameters may be unexpected.</dd></dl> <dl class="return"><dt><b>Returns:</b></dt><dd>float </dd></dl> </div> </div> -<a class="anchor" id="ad485084684991796cffdd8a008557569"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixGet" ref="ad485084684991796cffdd8a008557569" args="(const rs_matrix3x3 *m, uint32_t row, uint32_t col)" --> +<a class="anchor" id="acfebfc7b97e7282b78cd9c65b791932a"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixGet" ref="acfebfc7b97e7282b78cd9c65b791932a" args="(const rs_matrix3x3 *m, uint32_t col, uint32_t row)" --> <div class="memitem"> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">float rsMatrixGet </td> + <td class="memname">_RS_RUNTIME float rsMatrixGet </td> <td>(</td> <td class="paramtype">const <a class="el" href="structrs__matrix3x3.html">rs_matrix3x3</a> * </td> <td class="paramname"><em>m</em>, </td> @@ -136,13 +151,13 @@ Functions</h2></td></tr> <td class="paramkey"></td> <td></td> <td class="paramtype"><a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> </td> - <td class="paramname"><em>row</em>, </td> + <td class="paramname"><em>col</em>, </td> </tr> <tr> <td class="paramkey"></td> <td></td> <td class="paramtype"><a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> </td> - <td class="paramname"><em>col</em> </td> + <td class="paramname"><em>row</em> </td> </tr> <tr> <td></td> @@ -156,12 +171,12 @@ Functions</h2></td></tr> </div> </div> -<a class="anchor" id="aaa86b029d5c5c15fead5338bba02e4c3"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixGet" ref="aaa86b029d5c5c15fead5338bba02e4c3" args="(const rs_matrix2x2 *m, uint32_t row, uint32_t col)" --> +<a class="anchor" id="a683b4537b98103c50cc66780dfe8cd69"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixGet" ref="a683b4537b98103c50cc66780dfe8cd69" args="(const rs_matrix2x2 *m, uint32_t col, uint32_t row)" --> <div class="memitem"> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">float rsMatrixGet </td> + <td class="memname">_RS_RUNTIME float rsMatrixGet </td> <td>(</td> <td class="paramtype">const <a class="el" href="structrs__matrix2x2.html">rs_matrix2x2</a> * </td> <td class="paramname"><em>m</em>, </td> @@ -170,13 +185,13 @@ Functions</h2></td></tr> <td class="paramkey"></td> <td></td> <td class="paramtype"><a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> </td> - <td class="paramname"><em>row</em>, </td> + <td class="paramname"><em>col</em>, </td> </tr> <tr> <td class="paramkey"></td> <td></td> <td class="paramtype"><a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> </td> - <td class="paramname"><em>col</em> </td> + <td class="paramname"><em>row</em> </td> </tr> <tr> <td></td> @@ -204,10 +219,11 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Returns true if the matrix was successfully inversed</p> +<p>Inverts a matrix in place.</p> +<p>Returns true if the matrix was successfully inversed.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to invert. </td></tr> </table> </dd> </dl> @@ -228,10 +244,11 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Returns true if the matrix was successfully inversed and transposed.</p> +<p>Inverts and transpose a matrix in place.</p> +<p>The matrix is first inverted then transposed. Returns true if the matrix was successfully inverted.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to modify. </td></tr> </table> </dd> </dl> @@ -263,9 +280,11 @@ Functions</h2></td></tr> </div> <div class="memdoc"> <p>Set the elements of a matrix from an array of floats.</p> +<p>The array of floats should be in row-major order, i.e. the element a <em>row 0, column 0</em> should be first, followed by the element at <em>row 0, column 1</em>, etc.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to set. </td></tr> + <tr><td class="paramname">v</td><td>The array of values to set the matrix to. These arrays should be 4, 9, or 16 floats long, depending on the matrix size. </td></tr> </table> </dd> </dl> @@ -352,7 +371,20 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts. </p> +<p>Set the elements of a matrix from another matrix.</p> +<p>If the source matrix is smaller than the destination, the rest of the destination is filled with elements of the identity matrix. E.g. loading a <a class="el" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> into a <a class="el" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> will give:</p> + <table> + <tr><td>m00</td><td>m01</td><td>0.0</td><td>0.0</td></tr> + <tr><td>m10</td><td>m11</td><td>0.0</td><td>0.0</td></tr> + <tr><td>0.0</td><td>0.0</td><td>1.0</td><td>0.0</td></tr> + <tr><td>0.0</td><td>0.0</td><td>0.0</td><td>1.0</td></tr> + </table><dl><dt><b>Parameters:</b></dt><dd> + <table class="params"> + <tr><td class="paramname">m</td><td>The matrix to set. </td></tr> + <tr><td class="paramname">v</td><td>The source matrix. </td></tr> + </table> + </dd> +</dl> </div> </div> @@ -408,13 +440,7 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Set the elements of a matrix from another matrix.</p> -<dl><dt><b>Parameters:</b></dt><dd> - <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> - </table> - </dd> -</dl> +<p>This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts. </p> </div> </div> @@ -528,10 +554,13 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Load an Frustum projection matrix constructed from the 6 planes</p> +<p>Load a frustum projection matrix.</p> +<p>Constructs a frustum projection matrix, transforming the box identified by the six clipping planes <em>left, right, bottom, top, near, far</em>.</p> +<p>To apply this projection to a vector, multiply the vector by the created matrix using <a class="el" href="rs__matrix_8rsh.html#a4d9a8bb7c3f5d67b14fa349bdd531d13">rsMatrixMultiply</a>.</p> +<p>See <a href="https://www.opengl.org/documentation/specs/version2.0/glspec20.pdf">https://www.opengl.org/documentation/specs/version2.0/glspec20.pdf</a></p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to set. </td></tr> <tr><td class="paramname">left</td><td></td></tr> <tr><td class="paramname">right</td><td></td></tr> <tr><td class="paramname">bottom</td><td></td></tr> @@ -561,7 +590,7 @@ Functions</h2></td></tr> <p>Set the elements of a matrix to the identity matrix.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to set. </td></tr> </table> </dd> </dl> @@ -634,12 +663,15 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Multiply two matrix (lhs, rhs) and place the result in m.</p> +<p>Multiply two matrices.</p> +<p>Sets <em>m</em> to the matrix product of <em>lhs * rhs</em>.</p> +<p>To combine two 4x4 transformaton matrices, multiply the second transformation matrix by the first transformation matrix. E.g. to create a transformation matrix that applies the transformation <em>s1</em> followed by <em>s2</em>, call rsMatrixLoadMultiply(&combined, &s2, &s1).</p> +<dl class="warning"><dt><b>Warning:</b></dt><dd>As of version 21, storing the result back into right matrix is not supported and will result in undefined behavior. Use rsMatrixMulitply instead. E.g. instead of doing rsMatrixLoadMultiply (&m2r, &m2r, &m2l), use rsMatrixMultiply (&m2r, &m2l). rsMatrixLoadMultiply (&m2l, &m2r, &m2l) works as expected.</dd></dl> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> - <tr><td class="paramname">lhs</td><td></td></tr> - <tr><td class="paramname">rhs</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to set. </td></tr> + <tr><td class="paramname">lhs</td><td>The left matrix of the product. </td></tr> + <tr><td class="paramname">rhs</td><td>The right matrix of the product. </td></tr> </table> </dd> </dl> @@ -768,10 +800,13 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Load an Ortho projection matrix constructed from the 6 planes</p> +<p>Load an orthographic projection matrix.</p> +<p>Constructs an orthographic projection matrix, transforming the box identified by the six clipping planes <em>left, right, bottom, top, near, far</em> into a unit cube with a corner at <em>(-1, -1, -1)</em> and the opposite at <em>(1, 1, 1)</em>.</p> +<p>To apply this projection to a vector, multiply the vector by the created matrix using <a class="el" href="rs__matrix_8rsh.html#a4d9a8bb7c3f5d67b14fa349bdd531d13">rsMatrixMultiply</a>.</p> +<p>See <a href="https://en.wikipedia.org/wiki/Orthographic_projection">https://en.wikipedia.org/wiki/Orthographic_projection</a> and <a href="https://www.opengl.org/documentation/specs/version2.0/glspec20.pdf">https://www.opengl.org/documentation/specs/version2.0/glspec20.pdf</a></p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to set. </td></tr> <tr><td class="paramname">left</td><td></td></tr> <tr><td class="paramname">right</td><td></td></tr> <tr><td class="paramname">bottom</td><td></td></tr> @@ -826,14 +861,17 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Load an perspective projection matrix constructed from the 6 planes</p> +<p>Load a perspective projection matrix.</p> +<p>Constructs a perspective projection matrix, assuming a symmetrical field of view.</p> +<p>To apply this projection to a vector, multiply the vector by the created matrix using <a class="el" href="rs__matrix_8rsh.html#a4d9a8bb7c3f5d67b14fa349bdd531d13">rsMatrixMultiply</a>.</p> +<p>See <a href="https://www.opengl.org/documentation/specs/version2.0/glspec20.pdf">https://www.opengl.org/documentation/specs/version2.0/glspec20.pdf</a></p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to set. </td></tr> <tr><td class="paramname">fovy</td><td>Field of view, in degrees along the Y axis. </td></tr> <tr><td class="paramname">aspect</td><td>Ratio of x / y. </td></tr> - <tr><td class="paramname">near</td><td></td></tr> - <tr><td class="paramname">far</td><td></td></tr> + <tr><td class="paramname">near</td><td>The near clipping plane. </td></tr> + <tr><td class="paramname">far</td><td>The far clipping plane. </td></tr> </table> </dd> </dl> @@ -883,13 +921,16 @@ Functions</h2></td></tr> </div> <div class="memdoc"> <p>Load a rotation matrix.</p> +<p>This function creates a rotation matrix. The axis of rotation is the <em>(x, y, z)</em> vector.</p> +<p>To rotate a vector, multiply the vector by the created matrix using <a class="el" href="rs__matrix_8rsh.html#a4d9a8bb7c3f5d67b14fa349bdd531d13">rsMatrixMultiply</a>.</p> +<p>See <a href="http://en.wikipedia.org/wiki/Rotation_matrix">http://en.wikipedia.org/wiki/Rotation_matrix</a> .</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> - <tr><td class="paramname">rot</td><td></td></tr> - <tr><td class="paramname">x</td><td></td></tr> - <tr><td class="paramname">y</td><td></td></tr> - <tr><td class="paramname">z</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to set. </td></tr> + <tr><td class="paramname">rot</td><td>How much rotation to do, in degrees. </td></tr> + <tr><td class="paramname">x</td><td>The x component of the vector that is the axis of rotation. </td></tr> + <tr><td class="paramname">y</td><td>The y component of the vector that is the axis of rotation. </td></tr> + <tr><td class="paramname">z</td><td>The z component of the vector that is the axis of rotation. </td></tr> </table> </dd> </dl> @@ -933,12 +974,14 @@ Functions</h2></td></tr> </div> <div class="memdoc"> <p>Load a scale matrix.</p> +<p>This function creates a scaling matrix, where each component of a vector is multiplied by a number. This number can be negative.</p> +<p>To scale a vector, multiply the vector by the created matrix using <a class="el" href="rs__matrix_8rsh.html#a4d9a8bb7c3f5d67b14fa349bdd531d13">rsMatrixMultiply</a>.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> - <tr><td class="paramname">x</td><td></td></tr> - <tr><td class="paramname">y</td><td></td></tr> - <tr><td class="paramname">z</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to set. </td></tr> + <tr><td class="paramname">x</td><td>The multiple to scale the x components by. </td></tr> + <tr><td class="paramname">y</td><td>The multiple to scale the y components by. </td></tr> + <tr><td class="paramname">z</td><td>The multiple to scale the z components by. </td></tr> </table> </dd> </dl> @@ -982,12 +1025,14 @@ Functions</h2></td></tr> </div> <div class="memdoc"> <p>Load a translation matrix.</p> +<p>This function creates a translation matrix, where a number is added to each element of a vector.</p> +<p>To translate a vector, multiply the vector by the created matrix using <a class="el" href="rs__matrix_8rsh.html#a4d9a8bb7c3f5d67b14fa349bdd531d13">rsMatrixMultiply</a>.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> - <tr><td class="paramname">x</td><td></td></tr> - <tr><td class="paramname">y</td><td></td></tr> - <tr><td class="paramname">z</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to set. </td></tr> + <tr><td class="paramname">x</td><td>The number to add to each x component. </td></tr> + <tr><td class="paramname">y</td><td>The number to add to each y component. </td></tr> + <tr><td class="paramname">z</td><td>The number to add to each z component. </td></tr> </table> </dd> </dl> @@ -1018,11 +1063,13 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Multiply the matrix m by rhs and place the result back into m.</p> +<p>Multiply a matrix into another one.</p> +<p>Sets <em>m</em> to the matrix product <em>m * rhs</em>.</p> +<p>When combining two 4x4 transformation matrices using this function, the resulting matrix will correspond to performing the <em>rhs</em> transformation first followed by the original <em>m</em> transformation.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td>(lhs) </td></tr> - <tr><td class="paramname">rhs</td><td></td></tr> + <tr><td class="paramname">m</td><td>The left matrix of the product and the matrix to be set. </td></tr> + <tr><td class="paramname">rhs</td><td>The right matrix of the product. </td></tr> </table> </dd> </dl> @@ -1085,14 +1132,14 @@ Functions</h2></td></tr> </div> </div> -<a class="anchor" id="a2f11c3d7cc34ddce90ba785b93af8da2"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixMultiply" ref="a2f11c3d7cc34ddce90ba785b93af8da2" args="(const rs_matrix4x4 *m, float4 in)" --> +<a class="anchor" id="a47b6abbf32ffaf77bb13d96c3f05779f"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixMultiply" ref="a47b6abbf32ffaf77bb13d96c3f05779f" args="(rs_matrix4x4 *m, float4 in)" --> <div class="memitem"> <div class="memproto"> <table class="memname"> <tr> - <td class="memname"><a class="el" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> rsMatrixMultiply </td> + <td class="memname">_RS_RUNTIME <a class="el" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> rsMatrixMultiply </td> <td>(</td> - <td class="paramtype">const <a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> * </td> + <td class="paramtype"><a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> * </td> <td class="paramname"><em>m</em>, </td> </tr> <tr> @@ -1109,19 +1156,24 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Multiply a vector by a matrix and return the result vector. API version 14+</p> +<p>Multiply a vector by a matrix.</p> +<p>Returns the post-multiplication of the vector by the matrix, ie. <em>m * in</em>.</p> +<p>When multiplying a <em>float3</em> to a <em><a class="el" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a></em>, the vector is expanded with (1).</p> +<p>When multiplying a <em>float2</em> to a <em><a class="el" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a></em>, the vector is expanded with (0, 1).</p> +<p>When multiplying a <em>float2</em> to a <em><a class="el" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a></em>, the vector is expanded with (0).</p> +<p>This function is available in API version 10-13. Starting with API 14, the function takes a const matrix as the first argument.</p> <p>This is an overloaded member function, provided for convenience. It differs from the above function only in what argument(s) it accepts. </p> </div> </div> -<a class="anchor" id="a88ae2ed203769cb4a7917f84f6c1a2e2"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixMultiply" ref="a88ae2ed203769cb4a7917f84f6c1a2e2" args="(const rs_matrix3x3 *m, float3 in)" --> +<a class="anchor" id="a716bc2d29b80eb25388aba3ba8845aef"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixMultiply" ref="a716bc2d29b80eb25388aba3ba8845aef" args="(rs_matrix3x3 *m, float3 in)" --> <div class="memitem"> <div class="memproto"> <table class="memname"> <tr> - <td class="memname"><a class="el" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> rsMatrixMultiply </td> + <td class="memname">_RS_RUNTIME <a class="el" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> rsMatrixMultiply </td> <td>(</td> - <td class="paramtype">const <a class="el" href="structrs__matrix3x3.html">rs_matrix3x3</a> * </td> + <td class="paramtype"><a class="el" href="structrs__matrix3x3.html">rs_matrix3x3</a> * </td> <td class="paramname"><em>m</em>, </td> </tr> <tr> @@ -1142,14 +1194,14 @@ Functions</h2></td></tr> </div> </div> -<a class="anchor" id="a8d81a7143d5d45f60f7e91f955579bab"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixMultiply" ref="a8d81a7143d5d45f60f7e91f955579bab" args="(const rs_matrix2x2 *m, float2 in)" --> +<a class="anchor" id="a4d9a8bb7c3f5d67b14fa349bdd531d13"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixMultiply" ref="a4d9a8bb7c3f5d67b14fa349bdd531d13" args="(rs_matrix2x2 *m, float2 in)" --> <div class="memitem"> <div class="memproto"> <table class="memname"> <tr> - <td class="memname"><a class="el" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> rsMatrixMultiply </td> + <td class="memname">_RS_RUNTIME <a class="el" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> rsMatrixMultiply </td> <td>(</td> - <td class="paramtype">const <a class="el" href="structrs__matrix2x2.html">rs_matrix2x2</a> * </td> + <td class="paramtype"><a class="el" href="structrs__matrix2x2.html">rs_matrix2x2</a> * </td> <td class="paramname"><em>m</em>, </td> </tr> <tr> @@ -1212,14 +1264,16 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Multiple matrix m with a rotation matrix</p> +<p>Multiply the matrix <em>m</em> with a rotation matrix.</p> +<p>This function modifies a transformation matrix to first do a rotation. The axis of rotation is the <em>(x, y, z)</em> vector.</p> +<p>To apply this combined transformation to a vector, multiply the vector by the created matrix using <a class="el" href="rs__matrix_8rsh.html#a4d9a8bb7c3f5d67b14fa349bdd531d13">rsMatrixMultiply</a>.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> - <tr><td class="paramname">rot</td><td></td></tr> - <tr><td class="paramname">x</td><td></td></tr> - <tr><td class="paramname">y</td><td></td></tr> - <tr><td class="paramname">z</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to modify. </td></tr> + <tr><td class="paramname">rot</td><td>How much rotation to do, in degrees. </td></tr> + <tr><td class="paramname">x</td><td>The x component of the vector that is the axis of rotation. </td></tr> + <tr><td class="paramname">y</td><td>The y component of the vector that is the axis of rotation. </td></tr> + <tr><td class="paramname">z</td><td>The z component of the vector that is the axis of rotation. </td></tr> </table> </dd> </dl> @@ -1262,25 +1316,27 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Multiple matrix m with a scale matrix</p> +<p>Multiply the matrix <em>m</em> with a scaling matrix.</p> +<p>This function modifies a transformation matrix to first do a scaling. When scaling, each component of a vector is multiplied by a number. This number can be negative.</p> +<p>To apply this combined transformation to a vector, multiply the vector by the created matrix using <a class="el" href="rs__matrix_8rsh.html#a4d9a8bb7c3f5d67b14fa349bdd531d13">rsMatrixMultiply</a>.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> - <tr><td class="paramname">x</td><td></td></tr> - <tr><td class="paramname">y</td><td></td></tr> - <tr><td class="paramname">z</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to modify. </td></tr> + <tr><td class="paramname">x</td><td>The multiple to scale the x components by. </td></tr> + <tr><td class="paramname">y</td><td>The multiple to scale the y components by. </td></tr> + <tr><td class="paramname">z</td><td>The multiple to scale the z components by. </td></tr> </table> </dd> </dl> </div> </div> -<a class="anchor" id="ad6ea242218e0f1a031f754df0317e6e7"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixSet" ref="ad6ea242218e0f1a031f754df0317e6e7" args="(rs_matrix4x4 *m, uint32_t row, uint32_t col, float v)" --> +<a class="anchor" id="aca88832ed720e301780152c60884393e"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixSet" ref="aca88832ed720e301780152c60884393e" args="(rs_matrix4x4 *m, uint32_t col, uint32_t row, float v)" --> <div class="memitem"> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">void rsMatrixSet </td> + <td class="memname">_RS_RUNTIME void rsMatrixSet </td> <td>(</td> <td class="paramtype"><a class="el" href="structrs__matrix4x4.html">rs_matrix4x4</a> * </td> <td class="paramname"><em>m</em>, </td> @@ -1289,13 +1345,13 @@ Functions</h2></td></tr> <td class="paramkey"></td> <td></td> <td class="paramtype"><a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> </td> - <td class="paramname"><em>row</em>, </td> + <td class="paramname"><em>col</em>, </td> </tr> <tr> <td class="paramkey"></td> <td></td> <td class="paramtype"><a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> </td> - <td class="paramname"><em>col</em>, </td> + <td class="paramname"><em>row</em>, </td> </tr> <tr> <td class="paramkey"></td> @@ -1311,26 +1367,27 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Set one element of a matrix.</p> +<p>Set an element of a matrix.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td>The matrix to be set </td></tr> - <tr><td class="paramname">row</td><td></td></tr> - <tr><td class="paramname">col</td><td></td></tr> - <tr><td class="paramname">v</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix that will be modified. </td></tr> + <tr><td class="paramname">col</td><td>The zero-based column of the element to be set. </td></tr> + <tr><td class="paramname">row</td><td>The zero-based row of the element to be set. </td></tr> + <tr><td class="paramname">v</td><td>The value to set.</td></tr> </table> </dd> </dl> +<dl class="warning"><dt><b>Warning:</b></dt><dd>The order of the column and row parameters may be unexpected.</dd></dl> <dl class="return"><dt><b>Returns:</b></dt><dd>void </dd></dl> </div> </div> -<a class="anchor" id="ab69543f85a673f23fbb5f893e5824395"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixSet" ref="ab69543f85a673f23fbb5f893e5824395" args="(rs_matrix3x3 *m, uint32_t row, uint32_t col, float v)" --> +<a class="anchor" id="a08a247cdf2e70e78310bf04f9ecd5144"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixSet" ref="a08a247cdf2e70e78310bf04f9ecd5144" args="(rs_matrix3x3 *m, uint32_t col, uint32_t row, float v)" --> <div class="memitem"> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">void rsMatrixSet </td> + <td class="memname">_RS_RUNTIME void rsMatrixSet </td> <td>(</td> <td class="paramtype"><a class="el" href="structrs__matrix3x3.html">rs_matrix3x3</a> * </td> <td class="paramname"><em>m</em>, </td> @@ -1339,13 +1396,13 @@ Functions</h2></td></tr> <td class="paramkey"></td> <td></td> <td class="paramtype"><a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> </td> - <td class="paramname"><em>row</em>, </td> + <td class="paramname"><em>col</em>, </td> </tr> <tr> <td class="paramkey"></td> <td></td> <td class="paramtype"><a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> </td> - <td class="paramname"><em>col</em>, </td> + <td class="paramname"><em>row</em>, </td> </tr> <tr> <td class="paramkey"></td> @@ -1365,12 +1422,12 @@ Functions</h2></td></tr> </div> </div> -<a class="anchor" id="a0a85c8d3607f1b75019f6991c5b19fca"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixSet" ref="a0a85c8d3607f1b75019f6991c5b19fca" args="(rs_matrix2x2 *m, uint32_t row, uint32_t col, float v)" --> +<a class="anchor" id="af9707d7be5945bf55ed53683624176ff"></a><!-- doxytag: member="rs_matrix.rsh::rsMatrixSet" ref="af9707d7be5945bf55ed53683624176ff" args="(rs_matrix2x2 *m, uint32_t col, uint32_t row, float v)" --> <div class="memitem"> <div class="memproto"> <table class="memname"> <tr> - <td class="memname">void rsMatrixSet </td> + <td class="memname">_RS_RUNTIME void rsMatrixSet </td> <td>(</td> <td class="paramtype"><a class="el" href="structrs__matrix2x2.html">rs_matrix2x2</a> * </td> <td class="paramname"><em>m</em>, </td> @@ -1379,13 +1436,13 @@ Functions</h2></td></tr> <td class="paramkey"></td> <td></td> <td class="paramtype"><a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> </td> - <td class="paramname"><em>row</em>, </td> + <td class="paramname"><em>col</em>, </td> </tr> <tr> <td class="paramkey"></td> <td></td> <td class="paramtype"><a class="el" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> </td> - <td class="paramname"><em>col</em>, </td> + <td class="paramname"><em>row</em>, </td> </tr> <tr> <td class="paramkey"></td> @@ -1441,13 +1498,15 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Multiple matrix m with a translation matrix</p> +<p>Multiply the matrix <em>m</em> with a translation matrix.</p> +<p>This function modifies a transformation matrix to first do a translation. When translating, a number is added to each component of a vector.</p> +<p>To apply this combined transformation to a vector, multiply the vector by the created matrix using <a class="el" href="rs__matrix_8rsh.html#a4d9a8bb7c3f5d67b14fa349bdd531d13">rsMatrixMultiply</a>.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> - <tr><td class="paramname">x</td><td></td></tr> - <tr><td class="paramname">y</td><td></td></tr> - <tr><td class="paramname">z</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to modify. </td></tr> + <tr><td class="paramname">x</td><td>The number to add to each x component. </td></tr> + <tr><td class="paramname">y</td><td>The number to add to each y component. </td></tr> + <tr><td class="paramname">z</td><td>The number to add to each z component. </td></tr> </table> </dd> </dl> @@ -1468,10 +1527,10 @@ Functions</h2></td></tr> </table> </div> <div class="memdoc"> -<p>Transpose the matrix m.</p> +<p>Transpose the matrix m in place.</p> <dl><dt><b>Parameters:</b></dt><dd> <table class="params"> - <tr><td class="paramname">m</td><td></td></tr> + <tr><td class="paramname">m</td><td>The matrix to transpose. </td></tr> </table> </dd> </dl> diff --git a/docs/html/reference/renderscript/rs__matrix_8rsh_source.html b/docs/html/reference/renderscript/rs__matrix_8rsh_source.html index c1aaeb2..77144bd 100644 --- a/docs/html/reference/renderscript/rs__matrix_8rsh_source.html +++ b/docs/html/reference/renderscript/rs__matrix_8rsh_source.html @@ -3,7 +3,7 @@ <head> <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/> -<title>/usr/local/google/home/srhines/android_trees/jb-mr2-dev/frameworks/rs/scriptc/rs_matrix.rsh Source File</title> +<title>frameworks/rs/scriptc/rs_matrix.rsh Source File</title> <link href="tabs.css" rel="stylesheet" type="text/css"/> <link href="doxygen.css" rel="stylesheet" type="text/css" /> @@ -24,7 +24,7 @@ </div> <div class="header"> <div class="headertitle"> -<div class="title">/usr/local/google/home/srhines/android_trees/jb-mr2-dev/frameworks/rs/scriptc/rs_matrix.rsh</div> </div> +<div class="title">frameworks/rs/scriptc/rs_matrix.rsh</div> </div> </div> <div class="contents"> <a href="rs__matrix_8rsh.html">Go to the documentation of this file.</a><div class="fragment"><pre class="fragment"><a name="l00001"></a>00001 <span class="comment">/*</span> @@ -43,129 +43,128 @@ <a name="l00014"></a>00014 <span class="comment"> * limitations under the License.</span> <a name="l00015"></a>00015 <span class="comment"> */</span> <a name="l00016"></a>00016 -<a name="l00023"></a>00023 <span class="preprocessor">#ifndef __RS_MATRIX_RSH__</span> -<a name="l00024"></a>00024 <span class="preprocessor"></span><span class="preprocessor">#define __RS_MATRIX_RSH__</span> -<a name="l00025"></a>00025 <span class="preprocessor"></span> -<a name="l00036"></a>00036 _RS_RUNTIME <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00037"></a>00037 <a class="code" href="rs__matrix_8rsh.html#ad6ea242218e0f1a031f754df0317e6e7">rsMatrixSet</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <span class="keywordtype">float</span> v); -<a name="l00041"></a>00041 _RS_RUNTIME <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00042"></a>00042 <a class="code" href="rs__matrix_8rsh.html#ad6ea242218e0f1a031f754df0317e6e7">rsMatrixSet</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <span class="keywordtype">float</span> v); -<a name="l00046"></a>00046 _RS_RUNTIME <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00047"></a>00047 <a class="code" href="rs__matrix_8rsh.html#ad6ea242218e0f1a031f754df0317e6e7">rsMatrixSet</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <span class="keywordtype">float</span> v); -<a name="l00048"></a>00048 -<a name="l00058"></a>00058 _RS_RUNTIME <span class="keywordtype">float</span> __attribute__((overloadable)) -<a name="l00059"></a>00059 <a class="code" href="rs__matrix_8rsh.html#a22e983b67d3089c5cb97032e249ca335">rsMatrixGet</a>(const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col); -<a name="l00063"></a>00063 _RS_RUNTIME <span class="keywordtype">float</span> __attribute__((overloadable)) -<a name="l00064"></a>00064 <a class="code" href="rs__matrix_8rsh.html#a22e983b67d3089c5cb97032e249ca335">rsMatrixGet</a>(const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col); -<a name="l00068"></a>00068 _RS_RUNTIME <span class="keywordtype">float</span> __attribute__((overloadable)) -<a name="l00069"></a>00069 <a class="code" href="rs__matrix_8rsh.html#a22e983b67d3089c5cb97032e249ca335">rsMatrixGet</a>(const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col); -<a name="l00070"></a>00070 -<a name="l00076"></a>00076 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a0ffd9de971cf10d0a663ff565be8d3cc">rsMatrixLoadIdentity</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m); -<a name="l00080"></a>00080 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a0ffd9de971cf10d0a663ff565be8d3cc">rsMatrixLoadIdentity</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m); -<a name="l00084"></a>00084 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a0ffd9de971cf10d0a663ff565be8d3cc">rsMatrixLoadIdentity</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m); -<a name="l00085"></a>00085 -<a name="l00091"></a>00091 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, const <span class="keywordtype">float</span> *v); -<a name="l00095"></a>00095 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, const <span class="keywordtype">float</span> *v); -<a name="l00099"></a>00099 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, const <span class="keywordtype">float</span> *v); -<a name="l00103"></a>00103 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *v); -<a name="l00107"></a>00107 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *v); -<a name="l00108"></a>00108 -<a name="l00114"></a>00114 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *v); -<a name="l00118"></a>00118 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *v); -<a name="l00122"></a>00122 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *v); -<a name="l00123"></a>00123 -<a name="l00133"></a>00133 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00134"></a>00134 <a class="code" href="rs__matrix_8rsh.html#a268032f3ac6d766b1d7fe72a6cb50464">rsMatrixLoadRotate</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> rot, <span class="keywordtype">float</span> x, <span class="keywordtype">float</span> y, <span class="keywordtype">float</span> z); -<a name="l00135"></a>00135 -<a name="l00144"></a>00144 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00145"></a>00145 <a class="code" href="rs__matrix_8rsh.html#acaf51d1f9ad5041ce01fbf8b7c5923fd">rsMatrixLoadScale</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> x, <span class="keywordtype">float</span> y, <span class="keywordtype">float</span> z); -<a name="l00146"></a>00146 -<a name="l00155"></a>00155 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00156"></a>00156 <a class="code" href="rs__matrix_8rsh.html#a1b521c8a3d1260fa732cbf0a71af0e74">rsMatrixLoadTranslate</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> x, <span class="keywordtype">float</span> y, <span class="keywordtype">float</span> z); -<a name="l00157"></a>00157 -<a name="l00165"></a>00165 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00166"></a>00166 <a class="code" href="rs__matrix_8rsh.html#a79f14c4c0f5ecc1bbd0bf54da8b653ef">rsMatrixLoadMultiply</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *lhs, const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *rhs); -<a name="l00170"></a>00170 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00171"></a>00171 <a class="code" href="rs__matrix_8rsh.html#a79f14c4c0f5ecc1bbd0bf54da8b653ef">rsMatrixLoadMultiply</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *lhs, const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *rhs); -<a name="l00175"></a>00175 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00176"></a>00176 <a class="code" href="rs__matrix_8rsh.html#a79f14c4c0f5ecc1bbd0bf54da8b653ef">rsMatrixLoadMultiply</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *lhs, const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *rhs); -<a name="l00177"></a>00177 -<a name="l00184"></a>00184 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00185"></a>00185 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *rhs); -<a name="l00189"></a>00189 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00190"></a>00190 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *rhs); -<a name="l00194"></a>00194 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00195"></a>00195 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *rhs); -<a name="l00196"></a>00196 -<a name="l00206"></a>00206 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00207"></a>00207 <a class="code" href="rs__matrix_8rsh.html#ad5ed05ca4880397fb29615e3c6798de1">rsMatrixRotate</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> rot, <span class="keywordtype">float</span> x, <span class="keywordtype">float</span> y, <span class="keywordtype">float</span> z); -<a name="l00208"></a>00208 -<a name="l00217"></a>00217 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00218"></a>00218 <a class="code" href="rs__matrix_8rsh.html#a94cc6b22bd1a6c07a9a1c1d21afb392c">rsMatrixScale</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> x, <span class="keywordtype">float</span> y, <span class="keywordtype">float</span> z); -<a name="l00219"></a>00219 -<a name="l00228"></a>00228 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00229"></a>00229 <a class="code" href="rs__matrix_8rsh.html#a4df5f9b5bb6044f3c3426f2f58b94405">rsMatrixTranslate</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> x, <span class="keywordtype">float</span> y, <span class="keywordtype">float</span> z); -<a name="l00230"></a>00230 -<a name="l00242"></a>00242 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00243"></a>00243 <a class="code" href="rs__matrix_8rsh.html#a4c59884a0e534dbbcdc5655842732d43">rsMatrixLoadOrtho</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> left, <span class="keywordtype">float</span> right, <span class="keywordtype">float</span> bottom, <span class="keywordtype">float</span> top, <span class="keywordtype">float</span> near, <span class="keywordtype">float</span> far); -<a name="l00244"></a>00244 -<a name="l00256"></a>00256 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00257"></a>00257 <a class="code" href="rs__matrix_8rsh.html#ad25760aaf01e95d0055237afab41bbb3">rsMatrixLoadFrustum</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> left, <span class="keywordtype">float</span> right, <span class="keywordtype">float</span> bottom, <span class="keywordtype">float</span> top, <span class="keywordtype">float</span> near, <span class="keywordtype">float</span> far); -<a name="l00258"></a>00258 -<a name="l00268"></a>00268 extern <span class="keywordtype">void</span> __attribute__((overloadable)) -<a name="l00269"></a>00269 <a class="code" href="rs__matrix_8rsh.html#aa404c34d7478f2921f7415d2da95d02b">rsMatrixLoadPerspective</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a>* m, <span class="keywordtype">float</span> fovy, <span class="keywordtype">float</span> aspect, <span class="keywordtype">float</span> near, <span class="keywordtype">float</span> far); -<a name="l00270"></a>00270 -<a name="l00271"></a>00271 <span class="preprocessor">#if !defined(RS_VERSION) || (RS_VERSION < 14)</span> -<a name="l00272"></a>00272 <span class="preprocessor"></span> -<a name="l00276"></a>00276 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> __attribute__((overloadable)) -<a name="l00277"></a>00277 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> in); -<a name="l00278"></a>00278 -<a name="l00282"></a>00282 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> __attribute__((overloadable)) -<a name="l00283"></a>00283 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> in); +<a name="l00050"></a>00050 <span class="preprocessor">#ifndef __RS_MATRIX_RSH__</span> +<a name="l00051"></a>00051 <span class="preprocessor"></span><span class="preprocessor">#define __RS_MATRIX_RSH__</span> +<a name="l00052"></a>00052 <span class="preprocessor"></span> +<a name="l00066"></a>00066 _RS_RUNTIME <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00067"></a>00067 <a class="code" href="rs__matrix_8rsh.html#aca88832ed720e301780152c60884393e">rsMatrixSet</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <span class="keywordtype">float</span> v); +<a name="l00071"></a>00071 _RS_RUNTIME <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00072"></a>00072 <a class="code" href="rs__matrix_8rsh.html#aca88832ed720e301780152c60884393e">rsMatrixSet</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <span class="keywordtype">float</span> v); +<a name="l00076"></a>00076 _RS_RUNTIME <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00077"></a>00077 <a class="code" href="rs__matrix_8rsh.html#aca88832ed720e301780152c60884393e">rsMatrixSet</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row, <span class="keywordtype">float</span> v); +<a name="l00078"></a>00078 +<a name="l00091"></a>00091 _RS_RUNTIME <span class="keywordtype">float</span> __attribute__((overloadable)) +<a name="l00092"></a>00092 <a class="code" href="rs__matrix_8rsh.html#af26fdbf8b8f0ed5d1b53f62b2aef5110">rsMatrixGet</a>(const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row); +<a name="l00096"></a>00096 _RS_RUNTIME <span class="keywordtype">float</span> __attribute__((overloadable)) +<a name="l00097"></a>00097 <a class="code" href="rs__matrix_8rsh.html#af26fdbf8b8f0ed5d1b53f62b2aef5110">rsMatrixGet</a>(const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row); +<a name="l00101"></a>00101 _RS_RUNTIME <span class="keywordtype">float</span> __attribute__((overloadable)) +<a name="l00102"></a>00102 <a class="code" href="rs__matrix_8rsh.html#af26fdbf8b8f0ed5d1b53f62b2aef5110">rsMatrixGet</a>(const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> col, <a class="code" href="rs__types_8rsh.html#a435d1572bf3f880d55459d9805097f62">uint32_t</a> row); +<a name="l00103"></a>00103 +<a name="l00109"></a>00109 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a0ffd9de971cf10d0a663ff565be8d3cc">rsMatrixLoadIdentity</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m); +<a name="l00113"></a>00113 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a0ffd9de971cf10d0a663ff565be8d3cc">rsMatrixLoadIdentity</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m); +<a name="l00117"></a>00117 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a0ffd9de971cf10d0a663ff565be8d3cc">rsMatrixLoadIdentity</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m); +<a name="l00118"></a>00118 +<a name="l00130"></a>00130 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, const <span class="keywordtype">float</span> *v); +<a name="l00134"></a>00134 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, const <span class="keywordtype">float</span> *v); +<a name="l00138"></a>00138 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, const <span class="keywordtype">float</span> *v); +<a name="l00156"></a>00156 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *v); +<a name="l00160"></a>00160 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *v); +<a name="l00164"></a>00164 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *v); +<a name="l00168"></a>00168 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *v); +<a name="l00172"></a>00172 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac380c4117e047da494a74f0dad20fab3">rsMatrixLoad</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *v); +<a name="l00173"></a>00173 +<a name="l00191"></a>00191 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00192"></a>00192 <a class="code" href="rs__matrix_8rsh.html#a268032f3ac6d766b1d7fe72a6cb50464">rsMatrixLoadRotate</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> rot, <span class="keywordtype">float</span> x, <span class="keywordtype">float</span> y, <span class="keywordtype">float</span> z); +<a name="l00193"></a>00193 +<a name="l00208"></a>00208 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00209"></a>00209 <a class="code" href="rs__matrix_8rsh.html#acaf51d1f9ad5041ce01fbf8b7c5923fd">rsMatrixLoadScale</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> x, <span class="keywordtype">float</span> y, <span class="keywordtype">float</span> z); +<a name="l00210"></a>00210 +<a name="l00225"></a>00225 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00226"></a>00226 <a class="code" href="rs__matrix_8rsh.html#a1b521c8a3d1260fa732cbf0a71af0e74">rsMatrixLoadTranslate</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> x, <span class="keywordtype">float</span> y, <span class="keywordtype">float</span> z); +<a name="l00227"></a>00227 +<a name="l00247"></a>00247 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00248"></a>00248 <a class="code" href="rs__matrix_8rsh.html#a79f14c4c0f5ecc1bbd0bf54da8b653ef">rsMatrixLoadMultiply</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *lhs, const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *rhs); +<a name="l00252"></a>00252 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00253"></a>00253 <a class="code" href="rs__matrix_8rsh.html#a79f14c4c0f5ecc1bbd0bf54da8b653ef">rsMatrixLoadMultiply</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *lhs, const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *rhs); +<a name="l00257"></a>00257 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00258"></a>00258 <a class="code" href="rs__matrix_8rsh.html#a79f14c4c0f5ecc1bbd0bf54da8b653ef">rsMatrixLoadMultiply</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *lhs, const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *rhs); +<a name="l00259"></a>00259 +<a name="l00272"></a>00272 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00273"></a>00273 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *rhs); +<a name="l00277"></a>00277 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00278"></a>00278 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *rhs); +<a name="l00282"></a>00282 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00283"></a>00283 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *rhs); <a name="l00284"></a>00284 -<a name="l00288"></a>00288 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> __attribute__((overloadable)) -<a name="l00289"></a>00289 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in); -<a name="l00290"></a>00290 -<a name="l00294"></a>00294 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> __attribute__((overloadable)) -<a name="l00295"></a>00295 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> in); -<a name="l00296"></a>00296 -<a name="l00300"></a>00300 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> __attribute__((overloadable)) -<a name="l00301"></a>00301 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in); +<a name="l00300"></a>00300 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00301"></a>00301 <a class="code" href="rs__matrix_8rsh.html#ad5ed05ca4880397fb29615e3c6798de1">rsMatrixRotate</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> rot, <span class="keywordtype">float</span> x, <span class="keywordtype">float</span> y, <span class="keywordtype">float</span> z); <a name="l00302"></a>00302 -<a name="l00306"></a>00306 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> __attribute__((overloadable)) -<a name="l00307"></a>00307 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in); -<a name="l00308"></a>00308 <span class="preprocessor">#else</span> -<a name="l00309"></a>00309 <span class="preprocessor"></span> -<a name="l00313"></a>00313 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> __attribute__((overloadable)) -<a name="l00314"></a>00314 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> in); -<a name="l00315"></a>00315 -<a name="l00319"></a>00319 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> __attribute__((overloadable)) -<a name="l00320"></a>00320 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> in); -<a name="l00321"></a>00321 -<a name="l00325"></a>00325 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> __attribute__((overloadable)) -<a name="l00326"></a>00326 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in); -<a name="l00327"></a>00327 -<a name="l00331"></a>00331 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> __attribute__((overloadable)) -<a name="l00332"></a>00332 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> in); -<a name="l00333"></a>00333 -<a name="l00337"></a>00337 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> __attribute__((overloadable)) -<a name="l00338"></a>00338 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in); -<a name="l00339"></a>00339 -<a name="l00343"></a>00343 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> __attribute__((overloadable)) -<a name="l00344"></a>00344 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in); -<a name="l00345"></a>00345 <span class="preprocessor">#endif</span> -<a name="l00346"></a>00346 <span class="preprocessor"></span> -<a name="l00347"></a>00347 -<a name="l00353"></a>00353 <span class="keyword">extern</span> <span class="keywordtype">bool</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a00b6a334ba5ac94d84850f22ec9f4de5">rsMatrixInverse</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m); -<a name="l00354"></a>00354 -<a name="l00360"></a>00360 extern <span class="keywordtype">bool</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac05080d52da2d99a759ef34fa0655e82">rsMatrixInverseTranspose</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m); -<a name="l00361"></a>00361 -<a name="l00367"></a>00367 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a88095c70f1550c760844b3e32e41a31a">rsMatrixTranspose</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m); -<a name="l00371"></a>00371 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a88095c70f1550c760844b3e32e41a31a">rsMatrixTranspose</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m); -<a name="l00375"></a>00375 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a88095c70f1550c760844b3e32e41a31a">rsMatrixTranspose</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m); -<a name="l00376"></a>00376 -<a name="l00377"></a>00377 -<a name="l00378"></a>00378 <span class="preprocessor">#endif</span> +<a name="l00318"></a>00318 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00319"></a>00319 <a class="code" href="rs__matrix_8rsh.html#a94cc6b22bd1a6c07a9a1c1d21afb392c">rsMatrixScale</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> x, <span class="keywordtype">float</span> y, <span class="keywordtype">float</span> z); +<a name="l00320"></a>00320 +<a name="l00336"></a>00336 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00337"></a>00337 <a class="code" href="rs__matrix_8rsh.html#a4df5f9b5bb6044f3c3426f2f58b94405">rsMatrixTranslate</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> x, <span class="keywordtype">float</span> y, <span class="keywordtype">float</span> z); +<a name="l00338"></a>00338 +<a name="l00361"></a>00361 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00362"></a>00362 <a class="code" href="rs__matrix_8rsh.html#a4c59884a0e534dbbcdc5655842732d43">rsMatrixLoadOrtho</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> left, <span class="keywordtype">float</span> right, <span class="keywordtype">float</span> bottom, <span class="keywordtype">float</span> top, <span class="keywordtype">float</span> near, <span class="keywordtype">float</span> far); +<a name="l00363"></a>00363 +<a name="l00384"></a>00384 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00385"></a>00385 <a class="code" href="rs__matrix_8rsh.html#ad25760aaf01e95d0055237afab41bbb3">rsMatrixLoadFrustum</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <span class="keywordtype">float</span> left, <span class="keywordtype">float</span> right, <span class="keywordtype">float</span> bottom, <span class="keywordtype">float</span> top, <span class="keywordtype">float</span> near, <span class="keywordtype">float</span> far); +<a name="l00386"></a>00386 +<a name="l00403"></a>00403 extern <span class="keywordtype">void</span> __attribute__((overloadable)) +<a name="l00404"></a>00404 <a class="code" href="rs__matrix_8rsh.html#aa404c34d7478f2921f7415d2da95d02b">rsMatrixLoadPerspective</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a>* m, <span class="keywordtype">float</span> fovy, <span class="keywordtype">float</span> aspect, <span class="keywordtype">float</span> near, <span class="keywordtype">float</span> far); +<a name="l00405"></a>00405 +<a name="l00406"></a>00406 <span class="preprocessor">#if !defined(RS_VERSION) || (RS_VERSION < 14)</span> +<a name="l00407"></a>00407 <span class="preprocessor"></span> +<a name="l00421"></a>00421 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> __attribute__((overloadable)) +<a name="l00422"></a>00422 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> in); +<a name="l00423"></a>00423 +<a name="l00427"></a>00427 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> __attribute__((overloadable)) +<a name="l00428"></a>00428 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> in); +<a name="l00429"></a>00429 +<a name="l00433"></a>00433 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> __attribute__((overloadable)) +<a name="l00434"></a>00434 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in); +<a name="l00435"></a>00435 +<a name="l00439"></a>00439 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> __attribute__((overloadable)) +<a name="l00440"></a>00440 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> in); +<a name="l00441"></a>00441 +<a name="l00445"></a>00445 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> __attribute__((overloadable)) +<a name="l00446"></a>00446 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in); +<a name="l00447"></a>00447 +<a name="l00451"></a>00451 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> __attribute__((overloadable)) +<a name="l00452"></a>00452 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in); +<a name="l00453"></a>00453 <span class="preprocessor">#else</span> +<a name="l00454"></a>00454 <span class="preprocessor"></span> +<a name="l00467"></a>00467 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> __attribute__((overloadable)) +<a name="l00468"></a>00468 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> in); +<a name="l00469"></a>00469 +<a name="l00473"></a>00473 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> __attribute__((overloadable)) +<a name="l00474"></a>00474 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> in); +<a name="l00475"></a>00475 +<a name="l00479"></a>00479 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#adb5162dc168ddd471d948faa60b37c5e">float4</a> __attribute__((overloadable)) +<a name="l00480"></a>00480 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(const <a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m, <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in); +<a name="l00481"></a>00481 +<a name="l00485"></a>00485 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> __attribute__((overloadable)) +<a name="l00486"></a>00486 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> in); +<a name="l00487"></a>00487 +<a name="l00491"></a>00491 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#a0046fa0f208d0899adbcf1f8b5aafadd">float3</a> __attribute__((overloadable)) +<a name="l00492"></a>00492 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(const <a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m, <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in); +<a name="l00493"></a>00493 +<a name="l00497"></a>00497 _RS_RUNTIME <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> __attribute__((overloadable)) +<a name="l00498"></a>00498 <a class="code" href="rs__matrix_8rsh.html#a97953ab2606900a839e5816c619abe66">rsMatrixMultiply</a>(const <a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m, <a class="code" href="rs__types_8rsh.html#a5086d0fcb71f916c936af486ccf0dd41">float2</a> in); +<a name="l00499"></a>00499 <span class="preprocessor">#endif</span> +<a name="l00500"></a>00500 <span class="preprocessor"></span> +<a name="l00501"></a>00501 +<a name="l00509"></a>00509 <span class="keyword">extern</span> <span class="keywordtype">bool</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a00b6a334ba5ac94d84850f22ec9f4de5">rsMatrixInverse</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m); +<a name="l00510"></a>00510 +<a name="l00519"></a>00519 extern <span class="keywordtype">bool</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#ac05080d52da2d99a759ef34fa0655e82">rsMatrixInverseTranspose</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m); +<a name="l00520"></a>00520 +<a name="l00526"></a>00526 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a88095c70f1550c760844b3e32e41a31a">rsMatrixTranspose</a>(<a class="code" href="structrs__matrix4x4.html" title="4x4 float matrix">rs_matrix4x4</a> *m); +<a name="l00530"></a>00530 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a88095c70f1550c760844b3e32e41a31a">rsMatrixTranspose</a>(<a class="code" href="structrs__matrix3x3.html" title="3x3 float matrix">rs_matrix3x3</a> *m); +<a name="l00534"></a>00534 extern <span class="keywordtype">void</span> __attribute__((overloadable)) <a class="code" href="rs__matrix_8rsh.html#a88095c70f1550c760844b3e32e41a31a">rsMatrixTranspose</a>(<a class="code" href="structrs__matrix2x2.html" title="2x2 float matrix">rs_matrix2x2</a> *m); +<a name="l00535"></a>00535 +<a name="l00536"></a>00536 +<a name="l00537"></a>00537 <span class="preprocessor">#endif</span> </pre></div></div> </div> diff --git a/docs/html/samples/index.jd b/docs/html/samples/index.jd index c1213b6..ab15e32 100644 --- a/docs/html/samples/index.jd +++ b/docs/html/samples/index.jd @@ -1,5 +1,5 @@ page.title=Samples -page.tags="samples","examples","code" +page.tags=samples,examples,code @jd:body diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 70410c1..9ed70ed 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -1,5 +1,5 @@ page.title=Android SDK -page.tags="download" +page.tags=download page.template=sdk header.hide=1 page.metaDescription=Download the official Android SDK to develop apps for Android-powered devices. @@ -375,4 +375,4 @@ the ADT plugin to it.</p> <p class="note"><strong>Note:</strong> Some Linux distributions may include JDK 1.4 or Gnu Compiler for Java, both of which are <em>not</em> supported for Android development. </p> -</div><!-- end reqs -->
\ No newline at end of file +</div><!-- end reqs --> diff --git a/docs/html/tools/adk/adk.jd b/docs/html/tools/adk/adk.jd index 1651747..7e75c11 100644 --- a/docs/html/tools/adk/adk.jd +++ b/docs/html/tools/adk/adk.jd @@ -1,5 +1,5 @@ page.title=Accessory Development Kit 2011 Guide -page.tags="adk" +page.tags=adk @jd:body <div id="qv-wrapper"> diff --git a/docs/html/tools/adk/adk2.jd b/docs/html/tools/adk/adk2.jd index c60e920..d69125a 100644 --- a/docs/html/tools/adk/adk2.jd +++ b/docs/html/tools/adk/adk2.jd @@ -1,5 +1,5 @@ page.title=Accessory Development Kit 2012 Guide -page.tags="adk" +page.tags=adk @jd:body <div id="qv-wrapper"> diff --git a/docs/html/tools/adk/index.jd b/docs/html/tools/adk/index.jd index e035115..e08748fc 100644 --- a/docs/html/tools/adk/index.jd +++ b/docs/html/tools/adk/index.jd @@ -1,5 +1,5 @@ page.title=Accessory Development Kit -page.tags="adk" +page.tags=adk @jd:body <p>The Accessory Development Kit (ADK) is a reference implementation for hardware manufacturers and diff --git a/docs/html/tools/debugging/debugging-memory.jd b/docs/html/tools/debugging/debugging-memory.jd index a7f443c..fccb67e 100644 --- a/docs/html/tools/debugging/debugging-memory.jd +++ b/docs/html/tools/debugging/debugging-memory.jd @@ -1,5 +1,5 @@ page.title=Investigating Your RAM Usage -page.tags="memory","OutOfMemoryError" +page.tags=memory,OutOfMemoryError @jd:body <div id="qv-wrapper"> @@ -492,4 +492,4 @@ the Home screen, then return to your app).</li> <p class="note"><strong>Tip:</strong> You can also perform the above steps by using the "monkey" test framework. For more information on running the monkey test framework, read the <a href= "{@docRoot}tools/help/monkeyrunner_concepts.html">monkeyrunner</a> -documentation.</p>
\ No newline at end of file +documentation.</p> diff --git a/docs/html/tools/help/adb.jd b/docs/html/tools/help/adb.jd index 9eed3eb..e2dd196 100644 --- a/docs/html/tools/help/adb.jd +++ b/docs/html/tools/help/adb.jd @@ -1,7 +1,7 @@ page.title=Android Debug Bridge parent.title=Tools parent.link=index.html -page.tags="adb" +page.tags=adb @jd:body <div id="qv-wrapper"> diff --git a/docs/html/tools/help/adt.jd b/docs/html/tools/help/adt.jd index 4dac574..1bb3015 100644 --- a/docs/html/tools/help/adt.jd +++ b/docs/html/tools/help/adt.jd @@ -1,5 +1,5 @@ page.title=Android Developer Tools -page.tags="adt" +page.tags=adt @jd:body <div id="qv-wrapper"> diff --git a/docs/html/tools/help/draw9patch.jd b/docs/html/tools/help/draw9patch.jd index ebf2c6c..859b1cf 100644 --- a/docs/html/tools/help/draw9patch.jd +++ b/docs/html/tools/help/draw9patch.jd @@ -1,5 +1,5 @@ page.title=Draw 9-patch -page.tags="NinePatch" +page.tags=NinePatch @jd:body <p>The Draw 9-patch tool allows you to easily create a diff --git a/docs/html/tools/testing/testing_ui.jd b/docs/html/tools/testing/testing_ui.jd index 701415e..4318a21 100644 --- a/docs/html/tools/testing/testing_ui.jd +++ b/docs/html/tools/testing/testing_ui.jd @@ -90,7 +90,7 @@ Functional or black-box UI testing does not require testers to know the internal alt="User interface of uiautomatorviewer tool" height="327px" id="figure1"/> </a> <p class="img-caption"> - <strong>Figure 1.</strong> The {@code uiautomatorviewer} showing the captured interface of a test deviice. + <strong>Figure 1.</strong> The {@code uiautomatorviewer} showing the captured interface of a test device. </p> <p>To analyze the UI components of the application that you want to test:</p> diff --git a/docs/html/training/accessibility/index.jd b/docs/html/training/accessibility/index.jd index 0af1d87..ea54dc4 100644 --- a/docs/html/training/accessibility/index.jd +++ b/docs/html/training/accessibility/index.jd @@ -1,5 +1,5 @@ page.title=Implementing Accessibility -page.tags="navigation","input" +page.tags=navigation,input trainingnavtop=true startpage=true diff --git a/docs/html/training/activity-testing/index.jd b/docs/html/training/activity-testing/index.jd index ddede71..b9542b6 100644 --- a/docs/html/training/activity-testing/index.jd +++ b/docs/html/training/activity-testing/index.jd @@ -1,5 +1,5 @@ page.title=Testing Your Android Activity -page.tags="testing" +page.tags=testing trainingnavtop=true startpage=true diff --git a/docs/html/training/animation/index.jd b/docs/html/training/animation/index.jd index b6940f8..4f37788 100644 --- a/docs/html/training/animation/index.jd +++ b/docs/html/training/animation/index.jd @@ -1,5 +1,5 @@ page.title=Adding Animations -page.tags="Animator","views","layout","user interface" +page.tags=Animator,views,layout,user interface trainingnavtop=true startpage=true @@ -84,4 +84,4 @@ startpage=true <dd> Learn how to enable built-in animations when adding, removing, or updating child views in a layout. </dd> - </dl>
\ No newline at end of file + </dl> diff --git a/docs/html/training/articles/memory.jd b/docs/html/training/articles/memory.jd index cdc0cd4..f15af68 100644 --- a/docs/html/training/articles/memory.jd +++ b/docs/html/training/articles/memory.jd @@ -1,5 +1,5 @@ page.title=Managing Your App's Memory -page.tags="ram","low memory","OutOfMemoryError","onTrimMemory" +page.tags=ram,low memory,OutOfMemoryError,onTrimMemory page.article=true @jd:body diff --git a/docs/html/training/articles/perf-anr.jd b/docs/html/training/articles/perf-anr.jd index 87cfc1c..b32cc4f 100644 --- a/docs/html/training/articles/perf-anr.jd +++ b/docs/html/training/articles/perf-anr.jd @@ -1,5 +1,5 @@ page.title=Keeping Your App Responsive -page.tags="threads","asynctask" +page.tags=threads,asynctask page.article=true @jd:body diff --git a/docs/html/training/articles/perf-jni.jd b/docs/html/training/articles/perf-jni.jd index 9f880ec..1a40f62 100644 --- a/docs/html/training/articles/perf-jni.jd +++ b/docs/html/training/articles/perf-jni.jd @@ -1,5 +1,5 @@ page.title=JNI Tips -page.tags="ndk","native" +page.tags=ndk,native page.article=true @jd:body @@ -444,7 +444,9 @@ adb shell start</pre> <pre>D Late-enabling CheckJNI</pre> - +<p>You can also set the <code>android:debuggable</code> attribute in your application's manifest to +turn on CheckJNI just for your app. Note that the Android build tools will do this automatically for +certain build types. <a name="native_libraries" id="native_libraries"></a> diff --git a/docs/html/training/articles/security-ssl.jd b/docs/html/training/articles/security-ssl.jd index f52865a..0639fb0 100644 --- a/docs/html/training/articles/security-ssl.jd +++ b/docs/html/training/articles/security-ssl.jd @@ -1,5 +1,5 @@ page.title=Security with HTTPS and SSL -page.tags="network","certificates" +page.tags=network,certificates page.article=true @jd:body diff --git a/docs/html/training/articles/smp.jd b/docs/html/training/articles/smp.jd index 7240eec..0b45987 100644 --- a/docs/html/training/articles/smp.jd +++ b/docs/html/training/articles/smp.jd @@ -1,5 +1,5 @@ page.title=SMP Primer for Android -page.tags="ndk","native" +page.tags=ndk,native page.article=true @jd:body diff --git a/docs/html/training/backward-compatible-ui/index.jd b/docs/html/training/backward-compatible-ui/index.jd index 4baa55c..c8b6ecc 100644 --- a/docs/html/training/backward-compatible-ui/index.jd +++ b/docs/html/training/backward-compatible-ui/index.jd @@ -1,5 +1,5 @@ page.title=Creating Backward-Compatible UIs -page.tags="widgets","support" +page.tags=widgets,support trainingnavtop=true startpage=true diff --git a/docs/html/training/basics/actionbar/index.jd b/docs/html/training/basics/actionbar/index.jd index f0de758..0303043 100644 --- a/docs/html/training/basics/actionbar/index.jd +++ b/docs/html/training/basics/actionbar/index.jd @@ -1,5 +1,5 @@ page.title=Adding the Action Bar -page.tags="actionbar" +page.tags=actionbar trainingnavtop=true startpage=true diff --git a/docs/html/training/basics/data-storage/index.jd b/docs/html/training/basics/data-storage/index.jd index 4ccad75..fc0c8b5 100644 --- a/docs/html/training/basics/data-storage/index.jd +++ b/docs/html/training/basics/data-storage/index.jd @@ -1,5 +1,5 @@ page.title=Saving Data -page.tags="data storage","files","sql","database","preferences" +page.tags=data storage,files,sql,database,preferences trainingnavtop=true startpage=true diff --git a/docs/html/training/basics/fragments/fragment-ui.jd b/docs/html/training/basics/fragments/fragment-ui.jd index 14469bf..4fa5b70 100644 --- a/docs/html/training/basics/fragments/fragment-ui.jd +++ b/docs/html/training/basics/fragments/fragment-ui.jd @@ -66,9 +66,9 @@ and perform other fragment transactions.</p> initial fragment(s) to the activity during the activity's {@link android.app.Activity#onCreate onCreate()} method.</p> -<p>An important rule when dealing with fragments—especially those that you add at -runtime—is that the fragment must have a container {@link android.view.View} in the layout in -which the fragment's layout will reside.</p> +<p>An important rule when dealing with fragments—especially when adding fragments at +runtime—is that your activity layout must include a container {@link android.view.View} +in which you can insert the fragment.</p> <p>The following layout is an alternative to the layout shown in the <a href="creating.html">previous lesson</a> that shows only one fragment at a time. In order to replace diff --git a/docs/html/training/basics/fragments/index.jd b/docs/html/training/basics/fragments/index.jd index 987decf..e78b694 100644 --- a/docs/html/training/basics/fragments/index.jd +++ b/docs/html/training/basics/fragments/index.jd @@ -1,5 +1,5 @@ page.title=Building a Dynamic UI with Fragments -page.tags="fragments", "user interface", "support library" +page.tags=fragments,user interface,support library trainingnavtop=true startpage=true diff --git a/docs/html/training/basics/fragments/support-lib.jd b/docs/html/training/basics/fragments/support-lib.jd index d949267..1d538af 100644 --- a/docs/html/training/basics/fragments/support-lib.jd +++ b/docs/html/training/basics/fragments/support-lib.jd @@ -1,5 +1,5 @@ page.title=Using the Support Library -page.tags="support library" +page.tags=support library trainingnavtop=true diff --git a/docs/html/training/basics/intents/index.jd b/docs/html/training/basics/intents/index.jd index 59ba11f..aa0232a 100644 --- a/docs/html/training/basics/intents/index.jd +++ b/docs/html/training/basics/intents/index.jd @@ -1,5 +1,5 @@ page.title=Interacting with Other Apps -page.tags="intents","activity" +page.tags=intents,activity trainingnavtop=true startpage=true diff --git a/docs/html/training/basics/network-ops/index.jd b/docs/html/training/basics/network-ops/index.jd index db64fe9..1f6493f 100644 --- a/docs/html/training/basics/network-ops/index.jd +++ b/docs/html/training/basics/network-ops/index.jd @@ -1,5 +1,5 @@ page.title=Performing Network Operations -page.tags="network","wireless" +page.tags=network,wireless trainingnavtop=true startpage=true diff --git a/docs/html/training/basics/supporting-devices/index.jd b/docs/html/training/basics/supporting-devices/index.jd index 1e3eb42..6f339f4 100644 --- a/docs/html/training/basics/supporting-devices/index.jd +++ b/docs/html/training/basics/supporting-devices/index.jd @@ -1,5 +1,5 @@ page.title=Supporting Different Devices -page.tags="resources","screens","versions","localization" +page.tags=resources,screens,versions,localization trainingnavtop=true startpage=true diff --git a/docs/html/training/basics/supporting-devices/languages.jd b/docs/html/training/basics/supporting-devices/languages.jd index a2df2b8..aab1e38 100644 --- a/docs/html/training/basics/supporting-devices/languages.jd +++ b/docs/html/training/basics/supporting-devices/languages.jd @@ -1,6 +1,6 @@ page.title=Supporting Different Languages parent.title=Supporting Different Devices -page.tags="localizing","localization","resources", "formats", "l10n" +page.tags=localizing,localization,resources,formats,l10n parent.link=index.html trainingnavtop=true diff --git a/docs/html/training/beam-files/index.jd b/docs/html/training/beam-files/index.jd index e4bac2e..910fa38 100644 --- a/docs/html/training/beam-files/index.jd +++ b/docs/html/training/beam-files/index.jd @@ -1,5 +1,5 @@ page.title=Sharing Files with NFC -page.tags="NfcAdapter","Android Beam","share","file transfer" +page.tags=NfcAdapter,Android Beam,share,file transfer trainingnavtop=true startpage=true diff --git a/docs/html/training/camera/index.jd b/docs/html/training/camera/index.jd index c6b49cf..5501ab0 100644 --- a/docs/html/training/camera/index.jd +++ b/docs/html/training/camera/index.jd @@ -1,5 +1,5 @@ page.title=Capturing Photos -page.tags="camera","video","picture" +page.tags=camera,video,picture trainingnavtop=true startpage=true diff --git a/docs/html/training/cloudsave/conflict-res.jd b/docs/html/training/cloudsave/conflict-res.jd index 0ff50e2..73e75db 100644 --- a/docs/html/training/cloudsave/conflict-res.jd +++ b/docs/html/training/cloudsave/conflict-res.jd @@ -1,5 +1,5 @@ page.title=Resolving Cloud Save Conflicts -page.tags="cloud" +page.tags=cloud page.article=true @jd:body @@ -594,4 +594,4 @@ of coins. In this case, the number of entries in this dictionary may be much mor limited. Depending on your implementation, it might make sense to store the timestamp for when each entry in the dictionary was modified. When you detect that a given entry has not been modified in the last several weeks or months, it is -probably safe to transfer the coins into another entry and delete the old entry.</p>
\ No newline at end of file +probably safe to transfer the coins into another entry and delete the old entry.</p> diff --git a/docs/html/training/cloudsync/index.jd b/docs/html/training/cloudsync/index.jd index 8679009..cf7117c 100644 --- a/docs/html/training/cloudsync/index.jd +++ b/docs/html/training/cloudsync/index.jd @@ -1,5 +1,5 @@ page.title=Syncing to the Cloud -page.tags="cloud","sync","backup" +page.tags=cloud,sync,backup trainingnavtop=true startpage=true diff --git a/docs/html/training/connect-devices-wirelessly/index.jd b/docs/html/training/connect-devices-wirelessly/index.jd index aada1fd..3206d7f 100644 --- a/docs/html/training/connect-devices-wirelessly/index.jd +++ b/docs/html/training/connect-devices-wirelessly/index.jd @@ -1,5 +1,5 @@ page.title=Connecting Devices Wirelessly -page.tags="wifi","network","wireless" +page.tags=wifi,network,wireless trainingnavtop=true startpage=true diff --git a/docs/html/training/custom-views/index.jd b/docs/html/training/custom-views/index.jd index 1c09e66..87cd0b0 100644 --- a/docs/html/training/custom-views/index.jd +++ b/docs/html/training/custom-views/index.jd @@ -1,5 +1,5 @@ page.title=Creating Custom Views -page.tags="widgets","ui","layout" +page.tags=widgets,ui,layout trainingnavtop=true startpage=true diff --git a/docs/html/training/displaying-bitmaps/index.jd b/docs/html/training/displaying-bitmaps/index.jd index 8c11e52..831c64d 100644 --- a/docs/html/training/displaying-bitmaps/index.jd +++ b/docs/html/training/displaying-bitmaps/index.jd @@ -1,5 +1,5 @@ page.title=Displaying Bitmaps Efficiently -page.tags="bitmaps","images","graphics" +page.tags=bitmaps,images,graphics trainingnavtop=true startpage=true diff --git a/docs/html/training/efficient-downloads/index.jd b/docs/html/training/efficient-downloads/index.jd index 2ab93ae..d9d7ef0 100644 --- a/docs/html/training/efficient-downloads/index.jd +++ b/docs/html/training/efficient-downloads/index.jd @@ -1,5 +1,5 @@ page.title=Transferring Data Without Draining the Battery -page.tags="battery","network","wireless" +page.tags=battery,network,wireless trainingnavtop=true startpage=true diff --git a/docs/html/training/enterprise/index.jd b/docs/html/training/enterprise/index.jd index ac1b565..2926f71 100644 --- a/docs/html/training/enterprise/index.jd +++ b/docs/html/training/enterprise/index.jd @@ -1,5 +1,5 @@ page.title=Developing for Enterprise -page.tags="policy","privacy" +page.tags=policy,privacy trainingnavtop=true startpage=true diff --git a/docs/html/training/gestures/index.jd b/docs/html/training/gestures/index.jd index 9d21b08..260cfff 100644 --- a/docs/html/training/gestures/index.jd +++ b/docs/html/training/gestures/index.jd @@ -1,5 +1,5 @@ page.title=Using Touch Gestures -page.tags="input","navigation","gesturedetector","scroller" +page.tags=input,navigation,gesturedetector,scroller trainingnavtop=true startpage=true diff --git a/docs/html/training/graphics/opengl/index.jd b/docs/html/training/graphics/opengl/index.jd index cf33d80..3549f95 100644 --- a/docs/html/training/graphics/opengl/index.jd +++ b/docs/html/training/graphics/opengl/index.jd @@ -1,5 +1,5 @@ page.title=Displaying Graphics with OpenGL ES -page=tags="open gl","graphics" +page.tags=open gl,graphics trainingnavtop=true @jd:body diff --git a/docs/html/training/id-auth/index.jd b/docs/html/training/id-auth/index.jd index 2bae9c4..f15ee29 100644 --- a/docs/html/training/id-auth/index.jd +++ b/docs/html/training/id-auth/index.jd @@ -1,5 +1,5 @@ page.title=Remembering Users -page.tags="privacy","oauth","accounts" +page.tags=privacy,oauth,accounts trainingnavtop=true startpage=true diff --git a/docs/html/training/implementing-navigation/ancestral.jd b/docs/html/training/implementing-navigation/ancestral.jd index f4d7c1a..8aa0fd6 100644 --- a/docs/html/training/implementing-navigation/ancestral.jd +++ b/docs/html/training/implementing-navigation/ancestral.jd @@ -1,5 +1,5 @@ page.title=Providing Up Navigation -page.tags="up navigation","NavUtils","TaskStackBuilder" +page.tags=up navigation,NavUtils,TaskStackBuilder trainingnavtop=true diff --git a/docs/html/training/implementing-navigation/lateral.jd b/docs/html/training/implementing-navigation/lateral.jd index bb9d78c..9c83479 100644 --- a/docs/html/training/implementing-navigation/lateral.jd +++ b/docs/html/training/implementing-navigation/lateral.jd @@ -1,5 +1,5 @@ page.title=Creating Swipe Views with Tabs -page.tags="viewpager","horizontal","paging","swipe view","tabs" +page.tags=viewpager,horizontal,paging,swipe view,tabs trainingnavtop=true diff --git a/docs/html/training/implementing-navigation/nav-drawer.jd b/docs/html/training/implementing-navigation/nav-drawer.jd index f7f7916..679c240 100644 --- a/docs/html/training/implementing-navigation/nav-drawer.jd +++ b/docs/html/training/implementing-navigation/nav-drawer.jd @@ -1,5 +1,5 @@ page.title=Creating a Navigation Drawer -page.tags="DrawerLayout", "navigation" +page.tags=DrawerLayout,navigation trainingnavtop=true diff --git a/docs/html/training/implementing-navigation/temporal.jd b/docs/html/training/implementing-navigation/temporal.jd index 3abab53..e736648 100644 --- a/docs/html/training/implementing-navigation/temporal.jd +++ b/docs/html/training/implementing-navigation/temporal.jd @@ -1,5 +1,5 @@ page.title=Providing Proper Back Navigation -page.tags="back navigation","NavUtils","TaskStackBuilder" +page.tags=back navigation,NavUtils,TaskStackBuilder trainingnavtop=true diff --git a/docs/html/training/improving-layouts/index.jd b/docs/html/training/improving-layouts/index.jd index 8cb2258..a2ab7a1 100644 --- a/docs/html/training/improving-layouts/index.jd +++ b/docs/html/training/improving-layouts/index.jd @@ -1,5 +1,5 @@ page.title=Improving Layout Performance -page.tags="include","merge","viewstub","listview" +page.tags=include,merge,viewstub,listview trainingnavtop=true startpage=true @@ -63,4 +63,4 @@ portions of your layout on demand.</dd> <dd>If you've built an instance of {@link android.widget.ListView} that contains complex or data-heavy content in each list item, the scroll performance of the list might suffer. This lesson provides some tips about how you can make your scrolling performance more smooth.</dd> -</dl>
\ No newline at end of file +</dl> diff --git a/docs/html/training/in-app-billing/index.jd b/docs/html/training/in-app-billing/index.jd index 94708b8..4a446f3 100644 --- a/docs/html/training/in-app-billing/index.jd +++ b/docs/html/training/in-app-billing/index.jd @@ -1,5 +1,5 @@ page.title=Selling In-app Products -page.tags="billing" +page.tags=billing trainingnavtop=true startpage=true diff --git a/docs/html/training/keyboard-input/index.jd b/docs/html/training/keyboard-input/index.jd index 7ac79e6..46795c4 100644 --- a/docs/html/training/keyboard-input/index.jd +++ b/docs/html/training/keyboard-input/index.jd @@ -1,5 +1,5 @@ page.title=Handling Keyboard Input -page.tags="edittext","accessibility" +page.tags=edittext,accessibility trainingnavtop=true startpage=true @@ -52,4 +52,4 @@ through an attached keyboard.</p> <dd>Learn how to respond directly to keyboard input for user actions. </dd> -</dl>
\ No newline at end of file +</dl> diff --git a/docs/html/training/load-data-background/index.jd b/docs/html/training/load-data-background/index.jd index 29108e8..e991003 100644 --- a/docs/html/training/load-data-background/index.jd +++ b/docs/html/training/load-data-background/index.jd @@ -1,5 +1,5 @@ page.title=Loading Data in the Background -page.tags="cursorloader" +page.tags=cursorloader trainingnavtop=true startpage=true diff --git a/docs/html/training/location/index.jd b/docs/html/training/location/index.jd index e03eac6..249c42d 100644 --- a/docs/html/training/location/index.jd +++ b/docs/html/training/location/index.jd @@ -1,5 +1,5 @@ page.title=Making Your App Location-Aware -page.tags="location","geofence", "geofencing", "activity recognition", "activity detection", "gps" +page.tags=location,geofence,geofencing,activity recognition,activity detection,gps trainingnavtop=true startpage=true diff --git a/docs/html/training/managing-audio/index.jd b/docs/html/training/managing-audio/index.jd index 3e3bcf0..9391449 100644 --- a/docs/html/training/managing-audio/index.jd +++ b/docs/html/training/managing-audio/index.jd @@ -1,5 +1,5 @@ page.title=Managing Audio Playback -page.tags="audio","media" +page.tags=audio,media trainingnavtop=true startpage=true @@ -58,4 +58,4 @@ respond when that happens.</dd> <dt><b><a href="audio-output.html">Dealing with Audio Output Hardware</a></b></dt> <dd>Audio can be played from a number of sources. Learn how to find out where the audio is being played and how to handle a headset being disconnected during playback.</dd> - </dl>
\ No newline at end of file + </dl> diff --git a/docs/html/training/monitoring-device-state/index.jd b/docs/html/training/monitoring-device-state/index.jd index c3d700a..949c1da 100644 --- a/docs/html/training/monitoring-device-state/index.jd +++ b/docs/html/training/monitoring-device-state/index.jd @@ -1,5 +1,5 @@ page.title=Optimizing Battery Life -page.tags="network","internet" +page.tags=network,internet trainingnavtop=true startpage=true @@ -59,4 +59,4 @@ Wi-Fi or mobile connectivity before beginning high-bandwidth operations.</dd> those that aren't necessary due to the current device state. Learn to improve efficiency by toggling and cascading state change receivers and delay actions until the device is in a specific state.</dd> -</dl>
\ No newline at end of file +</dl> diff --git a/docs/html/training/multiple-apks/index.jd b/docs/html/training/multiple-apks/index.jd index 5754da9..40a26b9 100644 --- a/docs/html/training/multiple-apks/index.jd +++ b/docs/html/training/multiple-apks/index.jd @@ -1,5 +1,5 @@ page.title=Maintaining Multiple APKs -page.tags="support" +page.tags=support trainingnavtop=true startpage=true diff --git a/docs/html/training/multiple-threads/index.jd b/docs/html/training/multiple-threads/index.jd index cbd42b4..136f0af 100644 --- a/docs/html/training/multiple-threads/index.jd +++ b/docs/html/training/multiple-threads/index.jd @@ -1,5 +1,5 @@ page.title=Sending Operations to Multiple Threads -page.tags="threadpool","runnable" +page.tags=threadpool,runnable trainingnavtop=true startpage=true diff --git a/docs/html/training/notify-user/index.jd b/docs/html/training/notify-user/index.jd index 51f058f..f7d0f87 100644 --- a/docs/html/training/notify-user/index.jd +++ b/docs/html/training/notify-user/index.jd @@ -1,5 +1,5 @@ page.title=Notifying the User -page.tags="notifications" +page.tags=notifications trainingnavtop=true startpage=true diff --git a/docs/html/training/printing/index.jd b/docs/html/training/printing/index.jd index 8161b6b..e33e5e8 100644 --- a/docs/html/training/printing/index.jd +++ b/docs/html/training/printing/index.jd @@ -1,5 +1,5 @@ page.title=Printing Content -page.tags="print","navigation","gesturedetector","scroller" +page.tags=print,navigation,gesturedetector,scroller trainingnavtop=true startpage=true diff --git a/docs/html/training/run-background-service/index.jd b/docs/html/training/run-background-service/index.jd index 3360df5..22f3fc8 100644 --- a/docs/html/training/run-background-service/index.jd +++ b/docs/html/training/run-background-service/index.jd @@ -1,5 +1,5 @@ page.title=Running in a Background Service -page.tags="intentservice" +page.tags=intentservice trainingnavtop=true startpage=true diff --git a/docs/html/training/scheduling/index.jd b/docs/html/training/scheduling/index.jd index 9ffbc16..4d2db60 100644 --- a/docs/html/training/scheduling/index.jd +++ b/docs/html/training/scheduling/index.jd @@ -1,5 +1,5 @@ page.title=Managing Device Awake State -page.tags="" +page.tags= trainingnavtop=true startpage=true diff --git a/docs/html/training/search/index.jd b/docs/html/training/search/index.jd index 4070372..612e8e8 100644 --- a/docs/html/training/search/index.jd +++ b/docs/html/training/search/index.jd @@ -1,5 +1,5 @@ page.title=Adding Search Functionality -page.tags="searchview","database" +page.tags=searchview,database trainingnavtop=true startpage=true @@ -50,4 +50,4 @@ startpage=true <dt><b><a href="backward-compat.html">Remaining Backward Compatible</a></b></dt> <dd>Learn how to keep search features backward compatible with older devices by using.</dd> - </dl>
\ No newline at end of file + </dl> diff --git a/docs/html/training/secure-file-sharing/index.jd b/docs/html/training/secure-file-sharing/index.jd index aa009fc..4adc1c0 100644 --- a/docs/html/training/secure-file-sharing/index.jd +++ b/docs/html/training/secure-file-sharing/index.jd @@ -1,5 +1,5 @@ page.title=Sharing Files -page.tags="FileProvider","share","ContentProvider" +page.tags=FileProvider,share,ContentProvider trainingnavtop=true startpage=true diff --git a/docs/html/training/sharing/index.jd b/docs/html/training/sharing/index.jd index 06d42fc..58a69fc 100644 --- a/docs/html/training/sharing/index.jd +++ b/docs/html/training/sharing/index.jd @@ -1,5 +1,5 @@ page.title=Sharing Simple Data -page.tags="intents","share" +page.tags=intents,share trainingnavtop=true startpage=true diff --git a/docs/html/training/system-ui/index.jd b/docs/html/training/system-ui/index.jd index c45327f..56fa54b 100644 --- a/docs/html/training/system-ui/index.jd +++ b/docs/html/training/system-ui/index.jd @@ -1,5 +1,5 @@ page.title=Managing the System UI -page.tags="" +page.tags= trainingnavtop=true startpage=true @@ -120,4 +120,4 @@ bars. so that you can adjust your app's UI accordingly. </dd> -</dl>
\ No newline at end of file +</dl> |
