diff options
Diffstat (limited to 'docs/html')
107 files changed, 1793 insertions, 525 deletions
diff --git a/docs/html/about/dashboards/index.jd b/docs/html/about/dashboards/index.jd index 93876f8..e17a0fd 100644 --- a/docs/html/about/dashboards/index.jd +++ b/docs/html/about/dashboards/index.jd @@ -1,107 +1,65 @@ page.title=Dashboards -header.hide=1 @jd:body - - -<h2 id="Platform">Platform Versions</h2> - -<p>This page provides data about the relative number of active devices -running a given version of the Android platform. This can help you -understand the landscape of device distribution and decide how to prioritize -the development of your application features for the devices currently in -the hands of users. For information about how to target your application to devices based on -platform version, read about <a -href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">API levels</a>.</p> - - -<h3 id="PlatformCurrent">Current Distribution</h3> - -<p>The following pie chart and table is based on the number of Android devices that have accessed -Google Play within a 14-day period ending on the data collection date noted below.</p> - -<div class="col-5" style="margin-left:0"> - - -<table> -<tr> - <th>Version</th> - <th>Codename</th> - <th>API</th> - <th>Distribution</th> -</tr> -<tr><td><a href="/about/versions/android-1.6.html">1.6</a></td><td>Donut</td> <td>4</td><td>0.2%</td></tr> -<tr><td><a href="/about/versions/android-2.1.html">2.1</a></td><td>Eclair</td> <td>7</td><td>1.9%</td></tr> -<tr><td><a href="/about/versions/android-2.2.html">2.2</a></td><td>Froyo</td> <td>8</td><td>7.6%</td></tr> -<tr><td><a href="/about/versions/android-2.3.html">2.3 - 2.3.2</a> - </td><td rowspan="2">Gingerbread</td> <td>9</td><td>0.2%</td></tr> -<tr><td><a href="/about/versions/android-2.3.3.html">2.3.3 - 2.3.7 - </a></td><!-- Gingerbread --> <td>10</td><td>44%</td></tr> -<tr><td><a href="/about/versions/android-3.1.html">3.1</a></td> - <td rowspan="2">Honeycomb</td> <td>12</td><td>0.3%</td></tr> -<tr><td><a href="/about/versions/android-3.2.html">3.2</a></td> <!-- Honeycomb --><td>13</td><td>0.9%</td></tr> -<tr><td><a href="/about/versions/android-4.0.3.html">4.0.3 - 4.0.4</a></td> - <td>Ice Cream Sandwich</td><td>15</td><td>28.6%</td></tr> -<tr><td><a href="/about/versions/android-4.1.html">4.1</a></td> - <td rowspan="2">Jelly Bean</td><td>16</td><td>14.9%</td></tr> -<tr><td><a href="/about/versions/android-4.2.html">4.2</a></td><!--Jelly Bean--> <td>17</td><td>1.6%</td></tr> -</table> - +<style> +div.chart, +div.screens-chart { + display:none; +} +tr .total { + background-color:transparent; + border:0; + color:#666; +} +tr th.total { + font-weight:bold; +} +</style> + + + + +<div class="sidebox"> +<h2>Google Play Install Stats</h2> +<p>The Google Play Developer Console also provides <a +href="{@docRoot}distribute/googleplay/about/distribution.html#stats">detailed statistics</a> +about your users' devices. Those stats may help you prioritize the device profiles for which +you optimize your app.</p> </div> -<div class="col-8" style="margin-right:0"> -<img style="margin-left:30px" alt="" -src="//chart.apis.google.com/chart?&cht=p&chs=460x245&chf=bg,s,00000000&chd=t:2.0,7.6,44.2,1.2,28.6,16.5&chl=Eclair%20%26%20older|Froyo|Gingerbread|Honeycomb|Ice%20Cream%20Sandwich|Jelly%20Bean&chco=c4df9b,6fad0c" -/> - -</div><!-- end dashboard-panel --> - -<p style="clear:both"><em>Data collected during a 14-day period ending on March 4, 2013</em></p> -<!-- -<p style="font-size:.9em">* <em>Other: 0.1% of devices running obsolete versions</em></p> ---> - -<h3 id="PlatformHistorical">Historical Distribution</h3> - -<p>The following stacked line graph provides a history of the relative number of -active Android devices running different versions of the Android platform. It also provides a -valuable perspective of how many devices your application is compatible with, based on the -platform version.</p> - -<p>Notice that the platform versions are stacked on top of each other with the oldest active -version at the top. This format indicates the total percent of active devices that are compatible -with a given version of Android. For example, if you develop your application for -the version that is at the very top of the chart, then your application is -compatible with 100% of active devices (and all future versions), because all Android APIs are -forward compatible. Or, if you develop your application for a version lower on the chart, -then it is currently compatible with the percentage of devices indicated on the y-axis, where the -line for that version meets the y-axis on the right.</p> - -<p>Each dataset in the timeline is based on the number of Android devices that accessed -Google Play within a 14-day period ending on the date indicated on the x-axis.</p> - -<img alt="" height="250" width="660" -src="//chart.apis.google.com/chart?&cht=lc&chs=660x250&chxt=x,x,y,r&chf=bg,s,00000000&chxr=0,0,12|1,0,12|2,0,100|3,0,100&chxl=0%3A%7C09/01%7C09/15%7C10/01%7C10/15%7C11/01%7C11/15%7C12/01%7C12/15%7C01/01%7C01/15%7C02/01%7C02/15%7C03/01%7C1%3A%7C2012%7C%7C%7C%7C%7C%7C%7C%7C2013%7C%7C%7C%7C2013%7C2%3A%7C0%25%7C25%25%7C50%25%7C75%25%7C100%25%7C3%3A%7C0%25%7C25%25%7C50%25%7C75%25%7C100%25&chxp=0,0,1,2,3,4,5,6,7,8,9,10,11,12&chxtc=0,5&chd=t:99.3,99.4,99.5,99.5,99.5,99.6,100.0,100.0,100.0,100.0,100.0,100.0,100.0|95.6,95.8,96.1,96.3,96.4,96.7,96.9,97.2,97.4,97.4,97.6,97.7,97.9|81.4,82.3,83.2,83.8,84.7,85.6,86.4,87.0,88.2,88.8,89.4,89.9,90.3|23.7,25.5,27.4,28.7,31.1,33.0,35.4,36.8,40.3,42.0,43.6,45.1,46.0|21.5,23.5,25.5,26.8,29.4,31.4,33.8,35.2,38.8,40.7,42.3,43.9,44.8|1.1,1.4,1.8,2.1,3.2,4.8,6.5,7.5,9.9,11.7,13.3,14.8,16.1&chm=b,c3df9b,0,1,0|tFroyo,689326,1,0,15,,t::-5|b,b4db77,1,2,0|tGingerbread,547a19,2,0,15,,t::-5|b,a5db51,2,3,0|b,96dd28,3,4,0|tIce%20Cream%20Sandwich,293f07,4,0,15,,t::-5|b,83c916,4,5,0|tJelly%20Bean,131d02,5,9,15,,t::-5|B,6fad0c,5,6,0&chg=7,25&chdl=Eclair|Froyo|Gingerbread|Honeycomb|Ice%20Cream%20Sandwich|Jelly%20Bean&chco=add274,9dd14f,8ece2a,7ab61c,659b11,507d08" -/> -<p><em>Last historical dataset collected during a 14-day period ending on March 1, 2013</em></p> - - - - - - - - +<p>This page provides information about the relative number of devices that share a certain +characteristic, such as Android version or screen size. This information may +help you prioritize efforts for <a +href="{@docRoot}training/basics/supporting-devices/index.html">supporting different devices</a>.</p> +<p>Each snapshot of data represents all the devices that visited the Google Play Store in the +prior 14 days.</p> +<p class="note"><strong>Note:</strong> Beginning in April, 2013, these charts are now built +using data collected from each device when the user visits the Google Play Store. Previously, the +data was collected when the device simply checked-in to Google servers. We believe the new +data more accurately reflects those users who are most engaged in the Android and Google Play +ecosystem.</p> +<h2 id="Platform">Platform Versions</h2> +<p>This section provides data about the relative number of devices running a given version of +the Android platform.</p> +<p>For information about how to target your application to devices based on +platform version, read <a +href="{@docRoot}training/basics/supporting-devices/platforms.html">Supporting Different +Platform Versions</a>.</p> +<div id="version-chart"> +</div> +<p style="clear:both"><em>Data collected during a 14-day period ending on April 2, 2013. +<br/>Any versions with less than 0.1% distribution are not shown.</em> +</p> @@ -111,72 +69,22 @@ src="//chart.apis.google.com/chart?&cht=lc&chs=660x250&chxt=x,x,y,r&chf=bg,s,000 <h2 id="Screens">Screen Sizes and Densities</h2> -<img alt="" style="float:right;" -src="//chart.googleapis.com/chart?cht=p&chs=400x250&chf=bg,s,00000000&chco=c4df9b,6fad0c&chl=Xlarge%7CLarge%7CNormal%7CSmall&chd=t%3A4.6,6.1,86.6,2.7" /> - - -<img alt="" style="float:right;clear:right" -src="//chart.googleapis.com/chart?cht=p&chs=400x250&chf=bg,s,00000000&chco=c4df9b,6fad0c&chl=ldpi%7Cmdpi%7Chdpi%7Cxhdpi&chd=t%3A2.2,18,51.1,28.7" /> - - -<p>This section provides data about the relative number of active devices that have a particular +<p>This section provides data about the relative number of devices that have a particular screen configuration, defined by a combination of screen size and density. To simplify the way that you design your user interfaces for different screen configurations, Android divides the range of -actual screen sizes and densities into:</p> - -<ul> -<li>A set of four generalized <strong>sizes</strong>: <em>small</em>, <em>normal</em>, -<em>large</em>, and <em>xlarge</em></em></li> -<li>A set of four generalized <strong>densities</strong>: <em>ldpi</em> (low), <em>mdpi</em> -(medium), <em>hdpi</em> (high), and <em>xhdpi</em> (extra high)</li> -</ul> +actual screen sizes and densities into several buckets as expressed by the table below.</p> <p>For information about how you can support multiple screen configurations in your -application, see <a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple +application, read <a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a>.</p> -<p class="note"><strong>Note:</strong> This data is based on the number -of Android devices that have accessed Google Play within a 7-day period -ending on the data collection date noted below.</p> - - -<table style="width:350px"> -<tr> -<th></th> -<th scope="col">ldpi</th> -<th scope="col">mdpi</th> -<th scope="col">hdpi</th> -<th scope="col">xhdpi</th> -</tr> -<tr><th scope="row">small</th> -<td>1.7%</td> <!-- small/ldpi --> -<td></td> <!-- small/mdpi --> -<td>1.0%</td> <!-- small/hdpi --> -<td></td> <!-- small/xhdpi --> -</tr> -<tr><th scope="row">normal</th> -<td>0.4%</td> <!-- normal/ldpi --> -<td>11%</td> <!-- normal/mdpi --> -<td>50.1%</td> <!-- normal/hdpi --> -<td>25.1%</td> <!-- normal/xhdpi --> -</tr> -<tr><th scope="row">large</th> -<td>0.1%</td> <!-- large/ldpi --> -<td>2.4%</td> <!-- large/mdpi --> -<td></td> <!-- large/hdpi --> -<td>3.6%</td> <!-- large/xhdpi --> -</tr> -<tr><th scope="row">xlarge</th> -<td></td> <!-- xlarge/ldpi --> -<td>4.6%</td> <!-- xlarge/mdpi --> -<td></td> <!-- xlarge/hdpi --> -<td></td> <!-- xlarge/xhdpi --> -</tr> -</table> -<p style="clear:both"><em>Data collected during a 7-day period ending on October 1, 2012</em></p> +<div id="screens-chart"> +</div> +<p style="clear:both"><em>Data collected during a 14-day period ending on April 2, 2013 +<br/>Any screen configurations with less than 0.1% distribution are not shown.</em></p> @@ -187,14 +95,14 @@ ending on the data collection date noted below.</p> <h2 id="OpenGL">Open GL Version</h2> -<p>This section provides data about the relative number of active devices that support a particular +<p>This section provides data about the relative number of devices that support a particular version of OpenGL ES. Note that support for one particular version of OpenGL ES also implies support for any lower version (for example, support for version 2.0 also implies support for 1.1).</p> <img alt="" style="float:right" -src="//chart.googleapis.com/chart?cht=p&chs=400x250&chco=c4df9b,6fad0c&chl=GL%201.1%20only|GL%202.0%20%26%201.1&chd=t%3A9.2,90.8&chf=bg,s,00000000" /> +src="//chart.googleapis.com/chart?cht=p&chs=400x250&chco=c4df9b,6fad0c&chl=GL%201.1%20only|GL%202.0%20%26%201.1&chd=t%3A0.3,99.7&chf=bg,s,00000000" /> <p>To declare which version of OpenGL ES your application requires, you should use the {@code android:glEsVersion} attribute of the <a @@ -204,10 +112,6 @@ href="{@docRoot}guide/topics/manifest/supports-gl-texture-element.html">{@code <supports-gl-texture>}</a> element to declare the GL compression formats that your application uses.</p> -<p class="note"><strong>Note:</strong> This data is based on the number -of Android devices that have accessed Google Play within a 7-day period -ending on the data collection date noted below.</p> - <table style="width:350px"> <tr> @@ -216,14 +120,347 @@ ending on the data collection date noted below.</p> </tr> <tr> <td>1.1 only</th> -<td>9.2%</td> +<td>0.3%</td> </tr> <tr> <td>2.0 & 1.1</th> -<td>90.8%</td> +<td>99.7%</td> </tr> </table> -<p style="clear:both"><em>Data collected during a 7-day period ending on October 1, 2012</em></p> +<p style="clear:both"><em>Data collected during a 14-day period ending on April 2, 2013</em></p> + + + + + + + + + + + + + +<script> +var VERSION_DATA = +[ + { + "chart": "//chart.googleapis.com/chart?chf=bg%2Cs%2C00000000&chd=t%3A1.8%2C4.0%2C39.8%2C0.2%2C29.3%2C25.0&chl=Eclair%7CFroyo%7CGingerbread%7CHoneycomb%7CIce%20Cream%20Sandwich%7CJelly%20Bean&chs=500x250&cht=p&chco=c4df9b%2C6fad0c", + "data": [ + { + "api": 4, + "name": "Donut", + "perc": "0.1" + }, + { + "api": 7, + "name": "Eclair", + "perc": "1.7" + }, + { + "api": 8, + "name": "Froyo", + "perc": "4.0" + }, + { + "api": 9, + "name": "Gingerbread", + "perc": "0.1" + }, + { + "api": 10, + "name": "Gingerbread", + "perc": "39.7" + }, + { + "api": 13, + "name": "Honeycomb", + "perc": "0.2" + }, + { + "api": 15, + "name": "Ice Cream Sandwich", + "perc": "29.3" + }, + { + "api": 16, + "name": "Jelly Bean", + "perc": "23.0" + }, + { + "api": 17, + "name": "Jelly Bean", + "perc": "2.0" + } + ] + } +]; + + + + + +var SCREEN_DATA = +[ + { + "data": { + "Large": { + "hdpi": "0.5", + "ldpi": "0.7", + "mdpi": "2.7", + "tvdpi": "1.0", + "xhdpi": "0.8" + }, + "Normal": { + "hdpi": "37.9", + "ldpi": "0.1", + "mdpi": "16.1", + "xhdpi": "25.0", + "xxhdpi": "0.8" + }, + "Small": { + "ldpi": "9.5" + }, + "Xlarge": { + "hdpi": "0.1", + "ldpi": "0.1", + "mdpi": "4.6", + "xhdpi": "0.1" + } + }, + "densitychart": "//chart.googleapis.com/chart?chf=bg%2Cs%2C00000000&chd=t%3A10.4%2C23.4%2C1.0%2C38.5%2C25.9%2C0.8&chl=ldpi%7Cmdpi%7Ctvdpi%7Chdpi%7Cxhdpi%7Cxxhdpi&chs=400x250&cht=p&chco=c4df9b%2C6fad0c", + "layoutchart": "//chart.googleapis.com/chart?chf=bg%2Cs%2C00000000&chd=t%3A4.9%2C5.7%2C79.9%2C9.5&chl=Xlarge%7CLarge%7CNormal%7CSmall&chs=400x250&cht=p&chco=c4df9b%2C6fad0c" + } +]; + + + +var VERSION_NAMES = +[ + {"api":0},{"api":1},{"api":2},{"api":3}, + { + "api":4, + "link":"<a href='/about/versions/android-1.6.html'>1.6</a>", + "codename":"Donut", + }, + { "api":5}, + { "api":6}, + { + "api":7, + "link":"<a href='/about/versions/android-2.1.html'>2.1</a>", + "codename":"Eclair", + }, + { + "api":8, + "link":"<a href='/about/versions/android-2.2.html'>2.2</a>", + "codename":"Froyo" + }, + { + "api":9, + "link":"<a href='/about/versions/android-2.3.html'>2.3 -<br>2.3.2</a>", + "codename":"Gingerbread" + }, + { + "api":10, + "link":"<a href='/about/versions/android-2.3.3.html'>2.3.3 -<br>2.3.7</a>", + "codename":"Gingerbread" + }, + { "api":11}, + { + "api":12, + "link":"<a href='/about/versions/android-3.1.html'>3.1</a>", + "codename":"Honeycomb" + }, + { + "api":13, + "link":"<a href='/about/versions/android-3.2.html'>3.2</a>", + "codename":"Honeycomb" + }, + { "api":14}, + { + "api":15, + "link":"<a href='/about/versions/android-4.0.html'>4.0.3 -<br>4.0.4</a>", + "codename":"Ice Cream Sandwich" + }, + { + "api":16, + "link":"<a href='/about/versions/android-4.1.html'>4.1.x</a>", + "codename":"Jelly Bean" + }, + { + "api":17, + "link":"<a href='/about/versions/android-4.2.html'>4.2.x</a>", + "codename":"Jelly Bean" + } +]; + + + + + + + + + + + + + + + + + + + +$(document).ready(function(){ + // for each set of data (each month) + $.each(VERSION_DATA, function(i, set) { + + // set up wrapper divs + var $div = $('<div class="chart"' + + ((i == 0) ? ' style="display:block"' : '') + + ' >'); + var $divtable = $('<div class="col-5" style="margin-left:0">'); + var $divchart = $('<div class="col-8" style="margin-right:0">'); + + // set up a new table + var $table = $("<table>"); + var $trh = $("<tr><th>Version</th>" + + "<th>Codename</th>" + + "<th>API</th>" + + "<th>Distribution</th></tr>"); + $table.append($trh); + + // loop each data set (each api level represented in stats) + $.each(set.data, function(i, data) { + // check if we need to rowspan the codename + var rowspan = 1; + // must not be first row + if (i > 0) { + // if this row's codename is the same as previous row codename + if (data.name == set.data[i-1].name) { + rowspan = 0; + // otherwise, as long as this is not the last row + } else if (i < (set.data.length - 1)) { + // increment rowspan for each subsequent row w/ same codename + while (data.name == set.data[i+rowspan].name) { + rowspan++; + // unless we've reached the last row + if ((i + rowspan) >= set.data.length) break; + } + } + } + + // create table row and get corresponding version info from VERSION_NAMES + var $tr = $("<tr>"); + $tr.append("<td>" + VERSION_NAMES[data.api].link + "</td>"); + if (rowspan > 0) { + $tr.append("<td rowspan='" + rowspan + "'>" + VERSION_NAMES[data.api].codename + "</td>"); + } + $tr.append("<td>" + data.api + "</td>"); + $tr.append("<td>" + data.perc + "%</td>"); + $table.append($tr); + }); + + // create chart image + var $chart = $('<img style="margin-left:30px" alt="" src="' + set.chart + '" />'); + + // stack up and insert the elements + $divtable.append($table); + $divchart.append($chart); + $div.append($divtable).append($divchart); + $("#version-chart").append($div); + }); + + + + var SCREEN_SIZES = ["Small","Normal","Large","Xlarge"]; + var SCREEN_DENSITIES = ["ldpi","mdpi","tvdpi","hdpi","xhdpi","xxhdpi"]; + + + // for each set of screens data (each month) + $.each(SCREEN_DATA, function(i, set) { + + // set up wrapper divs + var $div = $('<div class="screens-chart"' + + ((i == 0) ? ' style="display:block"' : '') + + ' >'); + + // set up a new table + var $table = $("<table>"); + var $trh = $("<tr><th></th></tr>"); + $.each(SCREEN_DENSITIES, function(i, density) { + $trh.append("<th scope='col'>" + density + "</th>"); + }); + $trh.append("<th scope='col' class='total'>Total</th>"); + $table.append($trh); + + // array to hold totals for each density + var densityTotals = new Array(SCREEN_DENSITIES.length); + $.each(densityTotals, function(i, total) { + densityTotals[i] = 0; // make them all zero to start + }); + + // loop through each screen size + $.each(SCREEN_SIZES, function(i, size) { + // if there are any devices of this size + if (typeof set.data[size] != "undefined") { + // create table row and insert data + var $tr = $("<tr>"); + $tr.append("<th scope='row'>" + size + "</th>"); + // variable to sum all densities for this size + var total = 0; + // loop through each density + $.each(SCREEN_DENSITIES, function(i, density) { + var num = typeof set.data[size][density] != "undefined" ? set.data[size][density] : 0; + $tr.append("<td>" + (num != 0 ? num + "%" : "") + "</td>"); + total += parseFloat(num); + densityTotals[i] += parseFloat(num); + }) + $tr.append("<td class='total'>" + total.toFixed(1) + "%</td>"); + $table.append($tr); + } + }); + + // create row of totals for each density + var $tr = $("<tr><th class='total'>Total</th></tr>"); + $.each(densityTotals, function(i, total) { + $tr.append("<td class='total'>" + total.toFixed(1) + "%</td>"); + }); + $table.append($tr); + + // create charts + var $sizechart = $('<img style="float:left;width:380px" alt="" src="' + + set.layoutchart + '" />'); + var $densitychart = $('<img style="float:left;width:380px" alt="" src="' + + set.densitychart + '" />'); + + // stack up and insert the elements + $div.append($table).append($sizechart).append($densitychart); + $("#screens-chart").append($div); + }); + + +}); + + + +function changeVersionDate() { + var date = $('#date-versions option:selected').val(); + + $(".chart").hide(); + $(".chart."+date+"").show(); +} + + +function changeScreensVersionDate() { + var date = $('#date-screens option:selected').val(); + + $(".screens-chart").hide(); + $(".screens-chart."+date+"").show(); +} + +</script> diff --git a/docs/html/design/building-blocks/buttons.jd b/docs/html/design/building-blocks/buttons.jd index 82e2477..9e82ed4 100644 --- a/docs/html/design/building-blocks/buttons.jd +++ b/docs/html/design/building-blocks/buttons.jd @@ -1,4 +1,5 @@ page.title=Buttons +page.tags="button" @jd:body <p>A button consists of text and/or an image that clearly communicates what action will occur when the diff --git a/docs/html/design/building-blocks/dialogs.jd b/docs/html/design/building-blocks/dialogs.jd index a2ece2e..2f6ca27 100644 --- a/docs/html/design/building-blocks/dialogs.jd +++ b/docs/html/design/building-blocks/dialogs.jd @@ -1,4 +1,5 @@ page.title=Dialogs +page.tags="dialog","alert","popup","toast" @jd:body <p>Dialogs prompt the user for decisions or additional information required by the app to continue a diff --git a/docs/html/design/building-blocks/grid-lists.jd b/docs/html/design/building-blocks/grid-lists.jd index 775ebcc..69a43b1 100644 --- a/docs/html/design/building-blocks/grid-lists.jd +++ b/docs/html/design/building-blocks/grid-lists.jd @@ -1,4 +1,5 @@ page.title=Grid Lists +page.tags="gridview","layout" @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 aaa86b8..16927a6 100644 --- a/docs/html/design/building-blocks/lists.jd +++ b/docs/html/design/building-blocks/lists.jd @@ -1,4 +1,5 @@ page.title=Lists +page.tags="listview","layout" @jd:body <p>Lists present multiple line items in a vertical arrangement. They can be used for data selection as diff --git a/docs/html/design/building-blocks/pickers.jd b/docs/html/design/building-blocks/pickers.jd index b328df9..47363d0 100644 --- a/docs/html/design/building-blocks/pickers.jd +++ b/docs/html/design/building-blocks/pickers.jd @@ -1,4 +1,5 @@ page.title=Pickers +page.tags="datepicker","timepicker" @jd:body <p>Pickers provide a simple way to select a single value from a set. In addition to touching the diff --git a/docs/html/design/building-blocks/progress.jd b/docs/html/design/building-blocks/progress.jd index 7342387..96cc1af 100644 --- a/docs/html/design/building-blocks/progress.jd +++ b/docs/html/design/building-blocks/progress.jd @@ -1,4 +1,5 @@ page.title=Progress & Activity +page.tags="progressbar" @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 7695157..66999f9 100644 --- a/docs/html/design/building-blocks/scrolling.jd +++ b/docs/html/design/building-blocks/scrolling.jd @@ -1,4 +1,5 @@ page.title=Scrolling +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 3407ddd..9d38e36 100644 --- a/docs/html/design/building-blocks/seek-bars.jd +++ b/docs/html/design/building-blocks/seek-bars.jd @@ -1,4 +1,5 @@ page.title=Seek Bars and Sliders +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 279565f..8c80b91 100644 --- a/docs/html/design/building-blocks/spinners.jd +++ b/docs/html/design/building-blocks/spinners.jd @@ -1,4 +1,5 @@ page.title=Spinners +page.tags="spinner","drop down" @jd:body <p>Spinners provide a quick way to select one value from a set. In the default state, a spinner shows diff --git a/docs/html/design/building-blocks/switches.jd b/docs/html/design/building-blocks/switches.jd index d9cfd07..6386bdf 100644 --- a/docs/html/design/building-blocks/switches.jd +++ b/docs/html/design/building-blocks/switches.jd @@ -1,4 +1,5 @@ page.title=Switches +page.tags="switch","checkbox","radiobutton" @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 0a0f907..1fe2c62 100644 --- a/docs/html/design/building-blocks/tabs.jd +++ b/docs/html/design/building-blocks/tabs.jd @@ -1,4 +1,5 @@ page.title=Tabs +page.tags="tabs","action bar","navigation" @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 563f247..c1bed78 100644 --- a/docs/html/design/building-blocks/text-fields.jd +++ b/docs/html/design/building-blocks/text-fields.jd @@ -1,4 +1,5 @@ page.title=Text Fields +page.tags="text","edittext","input", @jd:body <p>Text fields allow the user to type text into your app. They can be either single line or multi-line. diff --git a/docs/html/design/patterns/accessibility.jd b/docs/html/design/patterns/accessibility.jd index 2c3333f..edf3843 100644 --- a/docs/html/design/patterns/accessibility.jd +++ b/docs/html/design/patterns/accessibility.jd @@ -1,4 +1,5 @@ page.title=Accessibility +page.tags="accessibility","navigation" @jd:body <p>One of Android's missions is to organize the world's information and make it universally accessible and useful. Accessibility is the measure of how successfully a product can be used by people with varying abilities. Our mission applies to all users-including people with disabilities such as visual impairment, color deficiency, hearing loss, and limited dexterity.</p> diff --git a/docs/html/design/patterns/actionbar.jd b/docs/html/design/patterns/actionbar.jd index 265ccde..da9c3c3 100644 --- a/docs/html/design/patterns/actionbar.jd +++ b/docs/html/design/patterns/actionbar.jd @@ -1,4 +1,5 @@ page.title=Action Bar +page.tags="actionbar","navigation" @jd:body <img src="{@docRoot}design/media/action_bar_pattern_overview.png"> diff --git a/docs/html/design/patterns/app-structure.jd b/docs/html/design/patterns/app-structure.jd index 04af57b..e1bb819 100644 --- a/docs/html/design/patterns/app-structure.jd +++ b/docs/html/design/patterns/app-structure.jd @@ -1,4 +1,5 @@ page.title=Application Structure +page.tags="navigation","layout" @jd:body <p>Apps come in many varieties that address very different needs. For example:</p> diff --git a/docs/html/design/patterns/confirming-acknowledging.jd b/docs/html/design/patterns/confirming-acknowledging.jd index ce0631b..f2e88ec 100644 --- a/docs/html/design/patterns/confirming-acknowledging.jd +++ b/docs/html/design/patterns/confirming-acknowledging.jd @@ -1,4 +1,5 @@ page.title=Confirming & Acknowledging +page.tags="dialog","toast" @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> diff --git a/docs/html/design/patterns/gestures.jd b/docs/html/design/patterns/gestures.jd index e579cee..3ef133d 100644 --- a/docs/html/design/patterns/gestures.jd +++ b/docs/html/design/patterns/gestures.jd @@ -1,4 +1,5 @@ page.title=Gestures +page.tags="gesture","input" @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/multi-pane-layouts.jd b/docs/html/design/patterns/multi-pane-layouts.jd index e607676..cbf29cb 100644 --- a/docs/html/design/patterns/multi-pane-layouts.jd +++ b/docs/html/design/patterns/multi-pane-layouts.jd @@ -1,4 +1,5 @@ page.title=Multi-pane Layouts +page.tags="tablet","navigation","layout","fragment" @jd:body <p>When writing an app for Android, keep in mind that Android devices come in many different screen diff --git a/docs/html/design/patterns/navigation.jd b/docs/html/design/patterns/navigation.jd index 656e6e5..36debbe 100644 --- a/docs/html/design/patterns/navigation.jd +++ b/docs/html/design/patterns/navigation.jd @@ -1,4 +1,5 @@ page.title=Navigation with Back and Up +page.tags="navigation","activity" @jd:body <p>Consistent navigation is an essential component of the overall user experience. Few things frustrate diff --git a/docs/html/design/patterns/notifications.jd b/docs/html/design/patterns/notifications.jd index 0665774..3ae827e 100644 --- a/docs/html/design/patterns/notifications.jd +++ b/docs/html/design/patterns/notifications.jd @@ -1,4 +1,5 @@ page.title=Notifications +page.tags="notification" @jd:body <p>The notification system allows your app to keep the user informed about events, such as new chat messages or a calendar event. Think of notifications as a news channel that alerts the user to important events as they happen or a log that chronicles events while the user is not paying attention.</p> diff --git a/docs/html/design/patterns/selection.jd b/docs/html/design/patterns/selection.jd index e9d22e6..682ce56 100644 --- a/docs/html/design/patterns/selection.jd +++ b/docs/html/design/patterns/selection.jd @@ -1,4 +1,5 @@ page.title=Selection +page.tags="actionmode","navigation" @jd:body <p>Android 3.0 changed the <em>long press</em> gesture—that is, a touch that's held in the same position for a moment—to be the global gesture to select data.. This affects the way you should diff --git a/docs/html/design/patterns/settings.jd b/docs/html/design/patterns/settings.jd index fef7585..f86cd39 100644 --- a/docs/html/design/patterns/settings.jd +++ b/docs/html/design/patterns/settings.jd @@ -1,4 +1,5 @@ page.title=Settings +page.tags="settings","preferences" @jd:body <p>Settings is a place in your app where users indicate their preferences for how your app should diff --git a/docs/html/design/patterns/swipe-views.jd b/docs/html/design/patterns/swipe-views.jd index daddd31..b86d990 100644 --- a/docs/html/design/patterns/swipe-views.jd +++ b/docs/html/design/patterns/swipe-views.jd @@ -1,4 +1,5 @@ page.title=Swipe Views +page.tags="viewpager","navigation" @jd:body <p>Efficient navigation is one of the cornerstones of a well-designed app. While apps are generally diff --git a/docs/html/design/patterns/widgets.jd b/docs/html/design/patterns/widgets.jd index 54726b1..a5979ce 100644 --- a/docs/html/design/patterns/widgets.jd +++ b/docs/html/design/patterns/widgets.jd @@ -1,4 +1,5 @@ page.title=Widgets +page.tags="appwidget" @jd:body <p>Widgets are an essential aspect of home screen customization. You can imagine them as "at-a-glance" views of an app's most important data and functionality that is accessible right from the user's home screen. Users can move widgets across their home screen panels, and, if supported, resize them to tailor the amount of information within a widget to their preference.</p> diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd index 190a6d9..0cb2635 100644 --- a/docs/html/develop/index.jd +++ b/docs/html/develop/index.jd @@ -345,7 +345,7 @@ function showDevelopersLivePlaylist() { var playlistId = "PLWz5rJ2EKKc_XOgcRukSoKKjewFJZrKV0"; /* DevBytes */ var script = "<script type='text/javascript' src='//gdata.youtube.com/feeds/api/playlists/" + playlistId + - "?v=2&alt=json-in-script&max-results=10&callback=renderDevelopersLivePlaylist&orderby=published'><\/script > "; + "?v=2&alt=json-in-script&max-results=10&callback=renderDevelopersLivePlaylist&orderby=reversedPosition'><\/script > "; $("body").append(script); } diff --git a/docs/html/google/gcm/gcm.jd b/docs/html/google/gcm/gcm.jd index 11b5a6c..26fc49a 100644 --- a/docs/html/google/gcm/gcm.jd +++ b/docs/html/google/gcm/gcm.jd @@ -149,7 +149,16 @@ it to receive messages. Once the Android application has the registration ID, it it to the 3rd-party application server, which uses it to identify each device that has registered to receive messages for a given Android application. In other words, a registration ID is tied to a particular Android application running on a particular -device.</td> +device. +<br/> +<br/> +<strong>Note:</strong> If you use +<a href="https://developer.android.com/google/backup/index.html">backup and restore</a>, +you should explicitly avoid backing up registration IDs. When you back up +a device, apps back up shared prefs indiscriminately. If you don't explicitly +exclude the GCM registration ID, it could get reused on a new device, +which would cause delivery errors. +</td> </tr> <tr> <td><strong>Google User Account</strong></td> @@ -295,6 +304,13 @@ include: </li> </ul> +<p class="note"><strong>Note:</strong> This section describes how to +write an app without using the +<a href="{@docRoot}reference/com/google/android/gcm/package-summary.html">helper libraries</a>. +For details on writing +an app that uses the helper libraries (which is the recommended and +simpler approach), see <a href="gs.html">GCM: Getting Started</a>. + <h3 id="manifest">Creating the Manifest</h3> <p>Every Android application must have an <code>AndroidManifest.xml</code> file (with @@ -585,6 +601,7 @@ ensures that the Android application cannot be installed in an environment in wh could not run properly. </li> </ul> + <h2 id="server">Role of the 3rd-party Application Server</h2> <p>Before you can write client Android applications that use the GCM feature, you must @@ -758,9 +775,15 @@ sent. Optional. The default value is <code>false</code>, and must be a JSON bool <pre class="prettyprint">collapse_key=score_update&time_to_live=108&delay_while_idle=1&data.score=4x8&data.time=15:16.2342&registration_id=42 </pre> - <p class="note"><strong>Note:</strong> If your organization has a firewall that restricts the traffic to or from the Internet, you'll need to configure it to allow connectivity with GCM. The ports to open are: 5228, 5229, and 5230. GCM typically only uses 5228, but it sometimes uses 5229 and 5230. -GCM doesn't provide specific IPs. It changes IPs frequently. We recommend against using ACLs but if you must use them, take a broad approach such as the method suggested in <a href="http://support.google.com/code/bin/answer.py?hl=en&answer=62464">this support link</a>. -</p> +<p class="note"><strong>Note:</strong> If your organization has a firewall +that restricts the traffic to or +from the Internet, you need to configure it to allow connectivity with GCM in order for +your Android devices to receive messages. +The ports to open are: 5228, 5229, and 5230. GCM typically only uses 5228, but +it sometimes uses 5229 and 5230. GCM doesn't provide specific IPs, so you should +allow your firewall to accept incoming connections from all IP addresses +contained in the IP blocks listed in Google's ASN of 15169.</p> + <h4 id="response">Response format</h4> @@ -770,7 +793,7 @@ GCM doesn't provide specific IPs. It changes IPs frequently. We recommend agains <li>The GCM server rejects the request.</li> </ul> -<p>When the messge is processed successfully, the HTTP response has a 200 status and the body contains more information about the status of the message (including possible errors). When the request is rejected, +<p>When the message is processed successfully, the HTTP response has a 200 status and the body contains more information about the status of the message (including possible errors). When the request is rejected, the HTTP response contains a non-200 status code (such as 400, 401, or 503).</p> <p>The following table summarizes the statuses that the HTTP response header might contain. Click the troubleshoot link for advice on how to deal with each type of error.</p> @@ -825,7 +848,7 @@ the HTTP response contains a non-200 status code (such as 400, 401, or 503).</p> <td>Array of objects representing the status of the messages processed. The objects are listed in the same order as the request (i.e., for each registration ID in the request, its result is listed in the same index in the response) and they can have these fields:<br> <ul> <li><code>message_id</code>: String representing the message when it was successfully processed.</li> - <li><code>registration_id</code>: If set, means that GCM processed the message but it has another canonical registration ID for that device, so sender should replace the IDs on future requests (otherwise they might be rejected). This field is never set if there is an error in the request.<br /> + <li><code>registration_id</code>: If set, means that GCM processed the message but it has another canonical registration ID for that device, so sender should replace the IDs on future requests (otherwise they might be rejected). This field is never set if there is an error in the request. </li> <li><code>error</code>: String describing an error that occurred while processing the message for that recipient. The possible values are the same as documented in the above table, plus "Unavailable" (meaning GCM servers were busy and could not process the message for that particular recipient, so it could be retried).</li> </ul></td> diff --git a/docs/html/google/gcm/gs.jd b/docs/html/google/gcm/gs.jd index 37ef684..5d34641 100644 --- a/docs/html/google/gcm/gs.jd +++ b/docs/html/google/gcm/gs.jd @@ -86,8 +86,15 @@ page.title=GCM: Getting Started <h2 id="libs">Install the Helper Libraries</h2> <p>To perform the steps described in the following sections, you must first install the -<a href="{@docRoot}reference/com/google/android/gcm/package-summary.html">helper libraries</a>. -From the SDK Manager, install <strong>Extras > Google Cloud Messaging for Android Library</strong>. This creates a <code>gcm</code> directory under <code><em>YOUR_SDK_ROOT</em>/extras/google/</code> containing these subdirectories: <code>gcm-client</code>, <code>gcm-server</code>, <code>samples/gcm-demo-client</code>, <code>samples/gcm-demo-server</code>, and <code>samples/gcm-demo-appengine</code>.</p> +<a href="{@docRoot}reference/com/google/android/gcm/package-summary.html">helper libraries</a>. Note that while using the helper libraries is recommended, it is not required. See the <a href="gcm.html#writing_apps">GCM Architectural Overview</a> for a description of how to write apps without using the helper libraries. + +<p>To install the helper libraries, choose +<strong>Extras > Google Cloud Messaging for Android Library</strong> +from the SDK Manager. This creates a <code>gcm</code> directory under +<code><em>YOUR_SDK_ROOT</em>/extras/google/</code> containing these +subdirectories: <code>gcm-client</code>, <code>gcm-server</code>, +<code>samples/gcm-demo-client</code>, <code>samples/gcm-demo-server</code>, +and <code>samples/gcm-demo-appengine</code>.</p> <p class="note"><strong>Note:</strong> If you don't see <strong>Extras > Google Cloud Messaging for Android Library</strong> in the SDK Manager, make sure you are running version 20 or higher. Be sure to restart the SDK Manager after updating it.</p> diff --git a/docs/html/google/play/billing/billing_integrate.jd b/docs/html/google/play/billing/billing_integrate.jd index 297e906..57227a8 100755 --- a/docs/html/google/play/billing/billing_integrate.jd +++ b/docs/html/google/play/billing/billing_integrate.jd @@ -19,6 +19,7 @@ parent.link=index.html <li><a href="#Subs">Implementing Subscriptions</a><li> </ol> </li> + <li><a href="#billing-security">Securing Your App</a> </ol> <h2>Reference</h2> <ol> @@ -40,31 +41,63 @@ parent.link=index.html <p class="note"><strong>Note:</strong> To see a complete implementation and learn how to test your application, see the <a href="{@docRoot}training/in-app-billing/index.html">Selling In-app Products</a> training class. The training class provides a complete sample In-app Billing application, including convenience classes to handle key tasks related to setting up your connection, sending billing requests and processing responses from Google Play, and managing background threading so that you can make In-app Billing calls from your main activity.</p> -<p>Before you start, be sure that you read the <a href="{@docRoot}google/play/billing/billing_overview.html">In-app Billing Overview</a> to familiarize yourself with concepts that will make it easier for you to implement In-app Billing.</p> +<p>Before you start, be sure that you read the <a href="{@docRoot}google/play/billing/billing_overview.html">In-app Billing Overview</a> to familiarize yourself with +concepts that will make it easier for you to implement In-app Billing.</p> -<p>To implement In-app Billing in your application, you need to do the following:</p> +<p>To implement In-app Billing in your application, you need to do the +following:</p> <ol> <li>Add the In-app Billing library to your project.</li> <li>Update your {@code AndroidManifest.xml} file.</li> - <li>Create a {@code ServiceConnection} and bind it to {@code IInAppBillingService}.</li> - <li>Send In-app Billing requests from your application to {@code IInAppBillingService}.</li> + <li>Create a {@code ServiceConnection} and bind it to +{@code IInAppBillingService}.</li> + <li>Send In-app Billing requests from your application to +{@code IInAppBillingService}.</li> <li>Handle In-app Billing responses from Google Play.</li> </ol> <h2 id="billing-add-aidl">Adding the AIDL file to your project</h2> -<p>The {@code TriviaDriva} sample application contains an Android Interface Definition Language (AIDL) file which defines the interface to Google Play's In-app Billing service. When you add this file to your project, the Android build environment creates an interface file (<code>IIAppBillingService.java</code>). You can then use this interface to make billing requests by invoking IPC method calls.</p> +<p>{@code IInAppBillingService.aidl} is an Android Interface Definition +Language (AIDL) file that defines the interface to the In-app Billing Version +3 service. You will use this interface to make billing requests by invoking IPC +method calls.</p> +<p>To get the AIDL file:</p> +<ol> +<li>Open the <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK Manager</a>.</li> +<li>In the SDK Manager, expand the {@code Extras} section.</li> +<li>Select <strong>Google Play Billing Library</strong>.</li> +<li>Click <strong>Install packages</strong> to complete the download.</li> +</ol> +<p>The {@code IInAppBillingService.aidl} file will be installed to {@code <sdk>/extras/google/play_billing/}.</p> -<p>To add the In-app Billing Version 3 library to your project:</p> +<p>To add the AIDL to your project:</p> <ol> <li>Copy the {@code IInAppBillingService.aidl} file to your Android project. <ul> - <li>If you are using Eclipse: Import the {@code IInAppBillingService.aidl} file into your {@code /src} directory. Eclipse automatically generates the interface file when you build your project.</li> - <li>If you are developing in a non-Eclipse environment: Create the following directory {@code /src/com/android/vending/billing} and copy the {@code IInAppBillingService.aidl} file into this directory. Put the AIDL file into your project and use the Ant tool to build your project so that the + <li>If you are using Eclipse: + <ol type="a"> + <li>If you are starting from an existing Android project, open the project +in Eclipse. If you are creating a new Android project from scratch, click +<strong>File</strong> > <strong>New</strong> > <strong>Android Application +Project</strong>, then follow the instructions in the <strong>New Android +Application</strong> wizard to create a new project in your workspace.</li> + <li>In the {@code /src} directory, click <strong>File</strong> > +<strong>New</strong> > <strong>Package</strong>, then create a package named {@code com.android.vending.billing}.</li> + <li>Copy the {@code IInAppBillingService.aidl} file from {@code <sdk>/extras/google/play_billing/} and paste it into the {@code src/com.android.vending.billing/} +folder in your workspace.</li> + </ol> + </li> + <li>If you are developing in a non-Eclipse environment: Create the following +directory {@code /src/com/android/vending/billing} and copy the +{@code IInAppBillingService.aidl} file into this directory. Put the AIDL file +into your project and use the Ant tool to build your project so that the <code>IInAppBillingService.java</code> file gets generated.</li> </ul> </li> -<li>Build your application. You should see a generated file named {@code IInAppBillingService.java} in the {@code /gen} directory of your project.</li> +<li>Build your application. You should see a generated file named +{@code IInAppBillingService.java} in the {@code /gen} directory of your +project.</li> </ol> @@ -329,6 +362,34 @@ Bundle activeSubs = mService.getPurchases(3, "com.example.myapp", the user. Once a subscription expires without renewal, it will no longer appear in the returned {@code Bundle}.</p> +<h2 id="billing-security">Securing Your Application</h2> + +<p>To help ensure the integrity of the transaction information that is sent to +your application, Google Play signs the JSON string that contains the response +data for a purchase order. Google Play uses the private key that is associated +with your application in the Developer Console to create this signature. The +Developer Console generates an RSA key pair for each application.<p> + +<p class="note"><strong>Note:</strong>To find the public key portion of this key +pair, open your application's details in the Developer Console, then click on +<strong>Services & APIs</strong>, and look at the field titled +<strong>Your License Key for This Application</strong>.</p> + +<p>The Base64-encoded RSA public key generated by Google Play is in binary +encoded, X.509 subjectPublicKeyInfo DER SEQUENCE format. It is the same public +key that is used with Google Play licensing.</p> + +<p>When your application receives this signed response you can +use the public key portion of your RSA key pair to verify the signature. +By performing signature verification you can detect responses that have +been tampered with or that have been spoofed. You can perform this signature +verification step in your application; however, if your application connects +to a secure remote server then we recommend that you perform the signature +verification on that server.</p> + +<p>For more information about best practices for security and design, see <a +href="{@docRoot}google/play/billing/billing_best_practices.html">Security and Design</a>.</p> + diff --git a/docs/html/google/play/billing/billing_reference.jd b/docs/html/google/play/billing/billing_reference.jd index 1410e65..e168d70 100755 --- a/docs/html/google/play/billing/billing_reference.jd +++ b/docs/html/google/play/billing/billing_reference.jd @@ -143,7 +143,9 @@ does not include tax.</td> </tr> <tr> <td>{@code INAPP_DATA_SIGNATURE}</td> - <td>String containing the signature of the purchase data that was signed with the private key of the developer.</td> + <td>String containing the signature of the purchase data that was signed +with the private key of the developer. The data signature uses the +RSASSA-PKCS1-v1_5 scheme.</td> </tr> </table> </p> diff --git a/docs/html/google/play/billing/billing_subscriptions.jd b/docs/html/google/play/billing/billing_subscriptions.jd index c2bbb49..2840dbc 100644 --- a/docs/html/google/play/billing/billing_subscriptions.jd +++ b/docs/html/google/play/billing/billing_subscriptions.jd @@ -3,26 +3,7 @@ parent.title=In-app Billing parent.link=index.html @jd:body -<!--notice block --> - <div style="background-color:#fffbd9;width:100%;margin-bottom:1em;padding:8px 8px 1px;"> - <p><em>15 February 2013</em></p> - <p>In-app Billing V3 now supports subscriptions and you can get - started developing today. A small app update is currently being - rolled out to Android devices. This process is automatic and - most devices will get the update in the next few days. However, - if you wish to get the update today to start developing right - away, simply reboot your device. </p> - - <p>However, we recommend that you <em>do not publish</em> an app with - V3 subscriptions until all Android devices have received the update. We'll - notify you here that all devices have received the update and its safe - to publish your apps that use V3 subscriptions. </p> - </div> - -<!-- Use non-standard wrapper to support notice block. Restore standard - wrapper when notice is removed. --> -<!--<div id="qv-wrapper"> --> -<div id="qv-wrapper" style="margin-top:.25em;"> +<div id="qv-wrapper"> <div id="qv"> <h2>Quickview</h2> <ul> diff --git a/docs/html/google/play/licensing/adding-licensing.jd b/docs/html/google/play/licensing/adding-licensing.jd index f991e14..93561f6 100644 --- a/docs/html/google/play/licensing/adding-licensing.jd +++ b/docs/html/google/play/licensing/adding-licensing.jd @@ -598,15 +598,15 @@ href="#impl-Obfuscator">Obfuscator</a> implementation. </p> <p>First, open the class file of the application's main Activity and import {@code LicenseChecker} and {@code LicenseCheckerCallback} from the LVL package.</p> -<pre> import com.android.vending.licensing.LicenseChecker; - import com.android.vending.licensing.LicenseCheckerCallback;</pre> +<pre> import com.google.android.vending.licensing.LicenseChecker; + import com.google.android.vending.licensing.LicenseCheckerCallback;</pre> <p>If you are using the default {@code Policy} implementation provided with the LVL, ServerManagedPolicy, import it also, together with the AESObfuscator. If you are using a custom {@code Policy} or {@code Obfuscator}, import those instead. </p> -<pre> import com.android.vending.licensing.ServerManagedPolicy; - import com.android.vending.licensing.AESObfuscator;</pre> +<pre> import com.google.android.vending.licensing.ServerManagedPolicy; + import com.google.android.vending.licensing.AESObfuscator;</pre> <h3 id="lc-impl">Implement LicenseCheckerCallback as a private inner class</h3> @@ -853,37 +853,39 @@ sample application calls <code>checkAccess()</code> from a <h3 id="account-key">Embed your public key for licensing</h3> -<p>For each publisher account, the Google Play service automatically -generates a 2048-bit RSA public/private key pair that is used exclusively for -licensing. The key pair is uniquely associated with the publisher account and is -shared across all applications that are published through the account. Although -associated with a publisher account, the key pair is <em>not</em> the same as -the key that you use to sign your applications (or derived from it).</p> +<p>For each application, the Google Play service automatically +generates a 2048-bit RSA public/private key pair that is used for +licensing and in-app billing. The key pair is uniquely associated with the +application. Although associated with the application, the key pair is +<em>not</em> the same as the key that you use to sign your applications (or derived from it).</p> <p>The Google Play Developer Console exposes the public key for licensing to any -developer signed in to the publisher account, but it keeps the private key +developer signed in to the Developer Console, but it keeps the private key hidden from all users in a secure location. When an application requests a license check for an application published in your account, the licensing server -signs the license response using the private key of your account's key pair. +signs the license response using the private key of your application's key pair. When the LVL receives the response, it uses the public key provided by the application to verify the signature of the license response. </p> -<p>To add licensing to an application, you must obtain your publisher account's +<p>To add licensing to an application, you must obtain your application's public key for licensing and copy it into your application. Here's how to find -your account's public key for licensing:</p> +your application's public key for licensing:</p> <ol> <li>Go to the Google Play <a href="http://play.google.com/apps/publish">Developer Console</a> and sign in. Make sure that you sign in to the account from which the application you are licensing is published (or will be published). </li> -<li>In the account home page, locate the "Edit profile" link and click it. </li> -<li>In the Edit Profile page, locate the "Licensing" pane, shown below. Your -public key for licensing is given in the "Public key" text box. </li> +<li>In the application details page, locate the <strong>Services & APIs</strong> +link and click it. </li> +<li>In the <strong>Services & APIs</strong> page, locate the +<strong>Licensing & In-App Billing</strong> section. Your public key for +licensing is given in the +<strong>Your License Key For This Application</strong> field. </li> </ol> <p>To add the public key to your application, simply copy/paste the key string -from the text box into your application as the value of the String variable +from the field into your application as the value of the String variable <code>BASE64_PUBLIC_KEY</code>. When you are copying, make sure that you have selected the entire key string, without omitting any characters. </p> @@ -965,16 +967,6 @@ application that they have legitimately purchased on another device.</li> </ul> </div> - - - - - - - - - - <h2 id="app-obfuscation">Obfuscating Your Code</h2> <p>To ensure the security of your application, particularly for a paid diff --git a/docs/html/google/play/licensing/index.jd b/docs/html/google/play/licensing/index.jd index a13be10..6632fc0 100644 --- a/docs/html/google/play/licensing/index.jd +++ b/docs/html/google/play/licensing/index.jd @@ -16,7 +16,7 @@ restrict use of the application to a specific device, in addition to any other c <p>The licensing service is a secure means of controlling access to your applications. When an application checks the licensing status, the Google Play server signs the licensing status -response using a key pair that is uniquely associated with the publisher account. Your application +response using a key pair that is uniquely associated with the application. Your application stores the public key in its compiled <code>.apk</code> file and uses it to verify the licensing status response.</p> diff --git a/docs/html/google/play/licensing/licensing-reference.jd b/docs/html/google/play/licensing/licensing-reference.jd index 4240097..7bfa61a 100644 --- a/docs/html/google/play/licensing/licensing-reference.jd +++ b/docs/html/google/play/licensing/licensing-reference.jd @@ -186,7 +186,7 @@ licensing server, possibly because of network availability problems. </td> </tr> <tr> <td>{@code ERROR_SERVER_FAILURE}</td> -<td>Server error — the server could not load the publisher account's key +<td>Server error — the server could not load the application's key pair for licensing.</td> <td>No</td> <td></td> diff --git a/docs/html/google/play/licensing/overview.jd b/docs/html/google/play/licensing/overview.jd index 2434a4c..4e1a9c9 100644 --- a/docs/html/google/play/licensing/overview.jd +++ b/docs/html/google/play/licensing/overview.jd @@ -38,13 +38,13 @@ the licensing server and receives the result. The Google Play application sends the result to your application, which can allow or disallow further use of the application as needed.</p> -<p class="note"><strong>Note:</strong> If a paid application has been uploaded to Google Play but -saved only as a draft application (the app is unpublished), the licensing server considers all users -to be licensed users of the application (because it's not even possible to purchase the app). -This exception is necessary in order for you to perform testing of your licensing +<p class="note"><strong>Note:</strong> If a paid application has been uploaded +to Google Play, but saved only as a draft application (the app is +unpublished), the licensing server considers all users to be licensed users of +the application (because it's not even possible to purchase the app). This +exception is necessary in order for you to perform testing of your licensing implementation.</p> - <div class="figure" style="width:469px"> <img src="{@docRoot}images/licensing_arch.png" alt=""/> <p class="img-caption"><strong>Figure 1.</strong> Your application initiates a @@ -102,10 +102,11 @@ response data using an RSA key pair that is shared exclusively between the Googl server and you.</p> <p>The licensing service generates a single licensing key pair for each -publisher account and exposes the public key in your account's profile page. You must copy the -public key from the web site and embed it in your application source code. The server retains the -private key internally and uses it to sign license responses for the applications you -publish with that account.</p> +application and exposes the public key in your application's +<strong>Services & APIs</strong> page in the Developer Console. You must copy +the public key from the Developer Console and embed it in your application +source code. The server retains the private key internally and uses it to sign +license responses for the applications you publish with that account.</p> <p>When your application receives a signed response, it uses the embedded public key to verify the data. The use of public key cryptography in the licensing @@ -221,7 +222,7 @@ gives you wider distribution potential for your applications. </p> <p>Licensing lets you move to a license-based model that is enforceable on all devices that have access to Google Play. Access is not bound to the characteristics of the host device, but to your -publisher account on Google Play (through the app's public key) and the +application on Google Play (through the app's public key) and the licensing policy that you define. Your application can be installed and managed on any device on any storage, including SD card.</p> diff --git a/docs/html/guide/components/activities.jd b/docs/html/guide/components/activities.jd index 2897804..1cbaa79 100644 --- a/docs/html/guide/components/activities.jd +++ b/docs/html/guide/components/activities.jd @@ -1,4 +1,5 @@ page.title=Activities +page.tags="activity","intent" @jd:body <div id="qv-wrapper"> diff --git a/docs/html/guide/components/fragments.jd b/docs/html/guide/components/fragments.jd index 7747b31..32c9f99 100644 --- a/docs/html/guide/components/fragments.jd +++ b/docs/html/guide/components/fragments.jd @@ -172,7 +172,7 @@ the user might not come back).</dd> <p>Most applications should implement at least these three methods for every fragment, but there are several other callback methods you should also use to handle various stages of the -fragment lifecycle. All the lifecycle callback methods are discussed more later, in the section +fragment lifecycle. All the lifecycle callback methods are discussed in more detail in the section about <a href="#Lifecycle">Handling the Fragment Lifecycle</a>.</p> diff --git a/docs/html/guide/practices/index.jd b/docs/html/guide/practices/index.jd index 04a43c5..48a849a 100644 --- a/docs/html/guide/practices/index.jd +++ b/docs/html/guide/practices/index.jd @@ -19,7 +19,7 @@ of fueling the impression-install-ranking cycle: improve the product!</p> <a href="http://android-developers.blogspot.com/2012/01/say-goodbye-to-menu-button.html"> <h4>Say Goodbye to the Menu Button</h4> - <p>As Ice Cream Sandwich rolls out to more devices, it?s important that you begin to migrate + <p>As Ice Cream Sandwich rolls out to more devices, it's important that you begin to migrate your designs to the action bar in order to promote a consistent Android user experience.</p> </a> @@ -49,4 +49,4 @@ make mistakes in the way they interact with the Android system and with other ap </div> -</div>
\ No newline at end of file +</div> diff --git a/docs/html/guide/topics/graphics/prop-animation.jd b/docs/html/guide/topics/graphics/prop-animation.jd index b733624..49d7bb8 100644 --- a/docs/html/guide/topics/graphics/prop-animation.jd +++ b/docs/html/guide/topics/graphics/prop-animation.jd @@ -479,7 +479,7 @@ ObjectAnimator.ofFloat(targetObject, "propName", 1f) </li> <li>Depending on what property or object you are animating, you might need to call the {@link - android.view.View#invalidate invalidate()} method on a View force the screen to redraw itself with the + android.view.View#invalidate invalidate()} method on a View to force the screen to redraw itself with the updated animated values. You do this in the {@link android.animation.ValueAnimator.AnimatorUpdateListener#onAnimationUpdate onAnimationUpdate()} callback. For example, animating the color property of a Drawable object only cause updates to the @@ -825,7 +825,7 @@ rotationAnim.setDuration(5000ms); <h2 id="views">Animating Views</h2> - <p>The property animation system allow streamlined animation of View objects and offerse + <p>The property animation system allow streamlined animation of View objects and offers a few advantages over the view animation system. The view animation system transformed View objects by changing the way that they were drawn. This was handled in the container of each View, because the View itself had no properties to manipulate. diff --git a/docs/html/guide/topics/manifest/data-element.jd b/docs/html/guide/topics/manifest/data-element.jd index 8fd91de..766d2d7 100644 --- a/docs/html/guide/topics/manifest/data-element.jd +++ b/docs/html/guide/topics/manifest/data-element.jd @@ -85,6 +85,9 @@ host names using lowercase letters.</p> The subtype can be the asterisk wildcard ({@code *}) to indicate that any subtype matches. +<p>It's common for an intent filter to declare a {@code <data>} that includes +only the {@code android:mimeType} attribute.</p> + <p class="note">Note: MIME type matching in the Android framework is case-sensitive, unlike formal RFC MIME types. As a result, you should always specify MIME types using lowercase letters.</p> diff --git a/docs/html/guide/topics/manifest/intent-filter-element.jd b/docs/html/guide/topics/manifest/intent-filter-element.jd index f90541c..68da981 100644 --- a/docs/html/guide/topics/manifest/intent-filter-element.jd +++ b/docs/html/guide/topics/manifest/intent-filter-element.jd @@ -119,7 +119,11 @@ one activity over others. <p> The value must be an integer, such as "{@code 100}". Higher numbers have a -higher priority. +higher priority. The default value is 0. +The value must be greater than -1000 and less than 1000.</p> + +<p>Also see {@link android.content.IntentFilter#setPriority +setPriority()}. </p></dd> </dl></dd> diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd index f9e2785..3b3bb8f 100644 --- a/docs/html/guide/topics/manifest/uses-sdk-element.jd +++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd @@ -26,14 +26,14 @@ parent.link=manifest-intro.html </div> </div> -<div class="sidebox-wrapper"> +<div class="sidebox-wrapper"> <div class="sidebox"> - <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;"> - <p style="color:#669999;padding-top:1em;">Google Play Filtering</p> + <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;"> + <p style="color:#669999;padding-top:1em;">Google Play Filtering</p> <p style="padding-top:1em;">Google Play uses the <code><uses-sdk></code> - attributes declared in your app manifest to filter your app from devices + attributes declared in your app manifest to filter your app from devices that do not meet it's platform version requirements. Before setting these - attributes, make sure that you understand + attributes, make sure that you understand <a href="{@docRoot}google/play/filters.html">Google Play filters</a>. </p> </div> </div> @@ -41,7 +41,7 @@ parent.link=manifest-intro.html <dl class="xml"> <dt>syntax:</dt> <dd><pre> -<uses-sdk android:<a href="#min">minSdkVersion</a>="<i>integer</i>" +<uses-sdk android:<a href="#min">minSdkVersion</a>="<i>integer</i>" android:<a href="#target">targetSdkVersion</a>="<i>integer</i>" android:<a href="#max">maxSdkVersion</a>="<i>integer</i>" /></pre></dd> @@ -55,14 +55,14 @@ API Level of a given Android system, which may vary among different Android devi </p> <p>Despite its name, this element is used to specify the API Level, <em>not</em> -the version number of the SDK (software development kit) or Android platform. +the version number of the SDK (software development kit) or Android platform. The API Level is always a single integer. You cannot derive the API Level from its associated Android version number (for example, it is not the same as the major version or the sum of the major and minor versions).</p> <p>Also read the document about <a href="{@docRoot}tools/publishing/versioning.html">Versioning Your Applications</a>. -</p></dd> +</p></dd> <dt>attributes:</dt> @@ -117,8 +117,8 @@ the corresponding platform version.</p> </dd> <dt><a name="max"></a>{@code android:maxSdkVersion}</dt> - <dd>An integer designating the maximum API Level on which the application is - designed to run. + <dd>An integer designating the maximum API Level on which the application is + designed to run. <p>In Android 1.5, 1.6, 2.0, and 2.0.1, the system checks the value of this attribute when installing an application and when re-validating the application @@ -165,7 +165,7 @@ installation or re-validation. Google Play will continue to use the attribute as a filter, however, when presenting users with applications available for download. </div> </dd> - + </dl></dd> @@ -217,7 +217,7 @@ modification.</p> <p>The framework API that an Android platform delivers is specified using an integer identifier called "API Level". Each Android platform version supports exactly one API Level, although support is implicit for all earlier API Levels -(down to API Level 1). The initial release of the Android platform provided +(down to API Level 1). The initial release of the Android platform provided API Level 1 and subsequent releases have incremented the API Level.</p> <p>The table below specifies the API Level supported by each version of the @@ -227,8 +227,8 @@ Versions dashboards page</a>.</p> <table> <tr><th>Platform Version</th><th>API Level</th><th>VERSION_CODE</th><th>Notes</th></tr> - - <tr><td><a href="{@docRoot}about/versions/android-4.2.html">Android 4.2</a></td> + + <tr><td><a href="{@docRoot}about/versions/android-4.2.html">Android 4.2, 4.2.2</a></td> <td><a href="{@docRoot}sdk/api_diff/17/changes.html" title="Diff Report">17</a></td> <td>{@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}</td> <td><a href="{@docRoot}about/versions/jelly-bean.html">Platform @@ -250,70 +250,70 @@ Highlights</a></td></tr> <td><a href="{@docRoot}sdk/api_diff/14/changes.html" title="Diff Report">14</a></td> <td>{@link android.os.Build.VERSION_CODES#ICE_CREAM_SANDWICH}</td> </tr> - + <tr><td><a href="{@docRoot}about/versions/android-3.2.html">Android 3.2</a></td> <td><a href="{@docRoot}sdk/api_diff/13/changes.html" title="Diff Report">13</a></td> <td>{@link android.os.Build.VERSION_CODES#HONEYCOMB_MR2}</td> <td><!-- <a href="{@docRoot}about/versions/android-3.2-highlights.html">Platform Highlights</a>--></td></tr> - + <tr><td><a href="{@docRoot}about/versions/android-3.1.html">Android 3.1.x</a></td> <td><a href="{@docRoot}sdk/api_diff/12/changes.html" title="Diff Report">12</a></td> <td>{@link android.os.Build.VERSION_CODES#HONEYCOMB_MR1}</td> <td><a href="{@docRoot}about/versions/android-3.1-highlights.html">Platform Highlights</a></td></tr> - + <tr><td><a href="{@docRoot}about/versions/android-3.0.html">Android 3.0.x</td> <td><a href="{@docRoot}sdk/api_diff/11/changes.html" title="Diff Report">11</a></td> <td>{@link android.os.Build.VERSION_CODES#HONEYCOMB}</td> <td><a href="{@docRoot}about/versions/android-3.0-highlights.html">Platform Highlights</a></td></tr> - + <tr><td><a href="{@docRoot}about/versions/android-2.3.3.html">Android 2.3.4<br>Android 2.3.3</td> <td><a href="{@docRoot}sdk/api_diff/10/changes.html" title="Diff Report">10</a></td> <td>{@link android.os.Build.VERSION_CODES#GINGERBREAD_MR1}</td> <td rowspan="2"><a href="{@docRoot}about/versions/android-2.3-highlights.html">Platform Highlights</a></td></tr> - + <tr><td><a href="{@docRoot}about/versions/android-2.3.html">Android 2.3.2<br>Android 2.3.1<br>Android 2.3</td> <td><a href="{@docRoot}sdk/api_diff/9/changes.html" title="Diff Report">9</a></td> <td>{@link android.os.Build.VERSION_CODES#GINGERBREAD}</td> </tr> - + <tr><td><a href="{@docRoot}about/versions/android-2.2.html">Android 2.2.x</td> <td ><a href="{@docRoot}sdk/api_diff/8/changes.html" title="Diff Report">8</a></td> <td>{@link android.os.Build.VERSION_CODES#FROYO}</td> <td><a href="{@docRoot}about/versions/android-2.2-highlights.html">Platform Highlights</a></td></tr> - + <tr><td><a href="{@docRoot}about/versions/android-2.1.html">Android 2.1.x</td> <td><a href="{@docRoot}sdk/api_diff/7/changes.html" title="Diff Report">7</a></td> <td>{@link android.os.Build.VERSION_CODES#ECLAIR_MR1}</td> <td rowspan="3" ><a href="{@docRoot}about/versions/android-2.0-highlights.html">Platform Highlights</a></td></tr> - + <tr><td><a href="{@docRoot}about/versions/android-2.0.1.html">Android 2.0.1</td> <td><a href="{@docRoot}sdk/api_diff/6/changes.html" title="Diff Report">6</a></td> <td>{@link android.os.Build.VERSION_CODES#ECLAIR_0_1}</td> </tr> - + <tr><td><a href="{@docRoot}about/versions/android-2.0.html">Android 2.0</td> <td><a href="{@docRoot}sdk/api_diff/5/changes.html" title="Diff Report">5</a></td> <td>{@link android.os.Build.VERSION_CODES#ECLAIR}</td> </tr> - + <tr><td><a href="{@docRoot}about/versions/android-1.6.html">Android 1.6</td> <td><a href="{@docRoot}sdk/api_diff/4/changes.html" title="Diff Report">4</a></td> <td>{@link android.os.Build.VERSION_CODES#DONUT}</td> <td><a href="{@docRoot}about/versions/android-1.6-highlights.html">Platform Highlights</a></td></tr> - + <tr><td><a href="{@docRoot}about/versions/android-1.5.html">Android 1.5</td> <td><a href="{@docRoot}sdk/api_diff/3/changes.html" title="Diff Report">3</a></td> <td>{@link android.os.Build.VERSION_CODES#CUPCAKE}</td> <td><a href="{@docRoot}about/versions/android-1.5-highlights.html">Platform Highlights</a></td></tr> - + <tr><td><a href="{@docRoot}about/versions/android-1.1.html">Android 1.1</td> <td>2</td> <td>{@link android.os.Build.VERSION_CODES#BASE_1_1}</td><td></td></tr> - + <tr><td>Android 1.0</td> <td>1</td> <td>{@link android.os.Build.VERSION_CODES#BASE}</td> @@ -324,10 +324,10 @@ Highlights</a></td></tr> <h2 id="uses">Uses of API Level in Android</h2> <p>The API Level identifier serves a key role in ensuring the best possible -experience for users and application developers: +experience for users and application developers: <ul> -<li>It lets the Android platform describe the maximum framework API revision +<li>It lets the Android platform describe the maximum framework API revision that it supports</li> <li>It lets applications describe the framework API revision that they require</li> @@ -349,7 +349,7 @@ on which the application is able to run. The default value is "1".</li> <li><code>android:targetSdkVersion</code> — Specifies the API Level on which the application is designed to run. In some cases, this allows the application to use manifest elements or behaviors defined in the target -API Level, rather than being restricted to using only those defined +API Level, rather than being restricted to using only those defined for the minimum API Level.</li> <li><code>android:maxSdkVersion</code> — Specifies the maximum API Level on which the application is able to run. <strong>Important:</strong> Please read the <a @@ -375,7 +375,7 @@ installation to begin only if these conditions are met:</p> must be less than or equal to the system's API Level integer. If not declared, the system assumes that the application requires API Level 1. </li> <li>If a <code>android:maxSdkVersion</code> attribute is declared, its value -must be equal to or greater than the system's API Level integer. +must be equal to or greater than the system's API Level integer. If not declared, the system assumes that the application has no maximum API Level. Please read the <a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html"><code><uses-sdk></code></a> @@ -470,7 +470,7 @@ might not receive an update for a significant amount of time. </p> <p>When you are developing your application, you will need to choose the platform version against which you will compile the application. In general, you should compile your application against the lowest possible -version of the platform that your application can support. +version of the platform that your application can support. <p>You can determine the lowest possible platform version by compiling the application against successively lower build targets. After you determine the @@ -513,7 +513,7 @@ download other platform versions as necessary. </p> located in the <sdk>/tools directory. You can launch the SDK updater by executing <code>android sdk</code>. You can also simply double-click the android.bat (Windows) or android (OS X/Linux) file. -In ADT, you can also access the updater by selecting +In ADT, you can also access the updater by selecting <strong>Window</strong> > <strong>Android SDK Manager</strong>.</p> @@ -552,9 +552,9 @@ Level integer.</p> <h2 id="filtering">Filtering the Reference Documentation by API Level</h2> <p>Reference documentation pages on the Android Developers site offer a "Filter -by API Level" control in the top-right area of each page. You can use the -control to show documentation only for parts of the API that are actually -accessible to your application, based on the API Level that it specifies in +by API Level" control in the top-right area of each page. You can use the +control to show documentation only for parts of the API that are actually +accessible to your application, based on the API Level that it specifies in the <code>android:minSdkVersion</code> attribute of its manifest file. </p> <p>To use filtering, select the checkbox to enable filtering, just below the @@ -574,10 +574,10 @@ disabled, so that you can view the full framework API, regardless of API Level. </p> <p>Also note that the reference documentation for individual API elements -specifies the API Level at which each element was introduced. The API Level -for packages and classes is specified as "Since <api level>" at the -top-right corner of the content area on each documentation page. The API Level -for class members is specified in their detailed description headers, +specifies the API Level at which each element was introduced. The API Level +for packages and classes is specified as "Since <api level>" at the +top-right corner of the content area on each documentation page. The API Level +for class members is specified in their detailed description headers, at the right margin. </p> diff --git a/docs/html/guide/topics/providers/calendar-provider.jd b/docs/html/guide/topics/providers/calendar-provider.jd index f53b062..5adc68c 100644 --- a/docs/html/guide/topics/providers/calendar-provider.jd +++ b/docs/html/guide/topics/providers/calendar-provider.jd @@ -605,7 +605,7 @@ ContentValues values = new ContentValues(); Uri updateUri = null; // The new title for the event values.put(Events.TITLE, "Kickboxing"); -myUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID); +updateUri = ContentUris.withAppendedId(Events.CONTENT_URI, eventID); int rows = getContentResolver().update(updateUri, values, null, null); Log.i(DEBUG_TAG, "Rows updated: " + rows); </pre> diff --git a/docs/html/guide/topics/resources/accessing-resources.jd b/docs/html/guide/topics/resources/accessing-resources.jd index 0673b6f..8f99653 100644 --- a/docs/html/guide/topics/resources/accessing-resources.jd +++ b/docs/html/guide/topics/resources/accessing-resources.jd @@ -50,7 +50,7 @@ the {@code aapt} tool automatically generates.</p> <p>When your application is compiled, {@code aapt} generates the {@code R} class, which contains resource IDs for all the resources in your {@code res/} directory. For each type of resource, there is an {@code R} subclass (for example, -{@code R.drawable} for all drawable resources) and for each resource of that type, there is a static +{@code R.drawable} for all drawable resources), and for each resource of that type, there is a static integer (for example, {@code R.drawable.icon}). This integer is the resource ID that you can use to retrieve your resource.</p> @@ -68,7 +68,7 @@ resource is a simple value (such as a string).</li> <p>There are two ways you can access a resource:</p> <ul> - <li><strong>In code:</strong> Using an static integer from a sub-class of your {@code R} + <li><strong>In code:</strong> Using a static integer from a sub-class of your {@code R} class, such as: <pre class="classic no-pretty-print">R.string.hello</pre> <p>{@code string} is the resource type and {@code hello} is the resource name. There are many @@ -264,11 +264,13 @@ reference a system resource, you would need to include the package name. For exa android:text="@string/hello" /> </pre> -<p class="note"><strong>Note:</strong> You should use string resources at all times, so that your -application can be localized for other languages. For information about creating alternative +<p class="note"><strong>Note:</strong> You should use string resources at +all times, so that your application can be localized for other languages. +For information about creating alternative resources (such as localized strings), see <a href="providing-resources.html#AlternativeResources">Providing Alternative -Resources</a>.</p> +Resources</a>. For a complete guide to localizing your application for other languages, +see <a href="localization.html">Localization</a>.</p> <p>You can even use resources in XML to create aliases. For example, you can create a drawable resource that is an alias for another drawable resource:</p> diff --git a/docs/html/guide/topics/resources/animation-resource.jd b/docs/html/guide/topics/resources/animation-resource.jd index 3af52aa..ef64f07 100644 --- a/docs/html/guide/topics/resources/animation-resource.jd +++ b/docs/html/guide/topics/resources/animation-resource.jd @@ -217,7 +217,7 @@ group animation elements together inside the <code><set></code> element, i </dd> <dt id="val-animator-element"><code><animator></code></dt> - <dd>Animates a over a specified amount of time. + <dd>Performs an animation over a specified amount of time. Represents a {@link android.animation.ValueAnimator}. <p class="caps">attributes:</p> diff --git a/docs/html/guide/topics/resources/providing-resources.jd b/docs/html/guide/topics/resources/providing-resources.jd index b311b7f..5097cc4 100644 --- a/docs/html/guide/topics/resources/providing-resources.jd +++ b/docs/html/guide/topics/resources/providing-resources.jd @@ -376,7 +376,7 @@ res/ screen area. Specifically, the device's smallestWidth is the shortest of the screen's available height and width (you may also think of it as the "smallest possible width" for the screen). You can use this qualifier to ensure that, regardless of the screen's current orientation, your -application's has at least {@code <N>} dps of width available for it UI.</p> +application has at least {@code <N>} dps of width available for its UI.</p> <p>For example, if your layout requires that its smallest dimension of screen area be at least 600 dp at all times, then you can use this qualifer to create the layout resources, {@code res/layout-sw600dp/}. The system will use these resources only when the smallest dimension of diff --git a/docs/html/guide/topics/search/search-dialog.jd b/docs/html/guide/topics/search/search-dialog.jd index b9a26d6..e24681a 100644 --- a/docs/html/guide/topics/search/search-dialog.jd +++ b/docs/html/guide/topics/search/search-dialog.jd @@ -722,6 +722,7 @@ public boolean onCreateOptionsMenu(Menu menu) { // Get the SearchView and set the searchable configuration SearchManager searchManager = (SearchManager) {@link android.app.Activity#getSystemService getSystemService}(Context.SEARCH_SERVICE); SearchView searchView = (SearchView) menu.findItem(R.id.menu_search).getActionView(); + // Assumes current activity is the searchable activity searchView.setSearchableInfo(searchManager.getSearchableInfo({@link android.app.Activity#getComponentName()})); searchView.setIconifiedByDefault(false); // Do not iconify the widget; expand it by default diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd index 3115c8f..db09e7d 100644 --- a/docs/html/guide/topics/ui/actionbar.jd +++ b/docs/html/guide/topics/ui/actionbar.jd @@ -1,4 +1,5 @@ page.title=Action Bar +page.tags="action bar","menu" parent.title=User Interface parent.link=index.html @jd:body @@ -673,7 +674,7 @@ action view still appears in the action bar when the user selects the item. You view collapsible by adding {@code "collapseActionView"} to the {@code android:showAsAction} attribute, as shown in the XML above.</p> -<p>Because the system will expand the action view when the user selects the item, so you +<p>Because the system will expand the action view when the user selects the item, you <em>do not</em> need to respond to the item in the {@link android.app.Activity#onOptionsItemSelected onOptionsItemSelected} callback. The system still calls {@link android.app.Activity#onOptionsItemSelected onOptionsItemSelected()} when the user selects it, diff --git a/docs/html/guide/topics/ui/binding.jd b/docs/html/guide/topics/ui/binding.jd index e8b49d5..a4fd25c 100644 --- a/docs/html/guide/topics/ui/binding.jd +++ b/docs/html/guide/topics/ui/binding.jd @@ -10,13 +10,6 @@ parent.link=index.html <li><a href="#FillingTheLayout">Filling the Layout with Data</a></li> <li><a href="#HandlingUserSelections">Handling User Selections</a></li> </ol> - - <h2>Related tutorials</h2> - <ol> - <li><a href="{@docRoot}resources/tutorials/views/hello-spinner.html">Spinner</a></li> - <li><a href="{@docRoot}resources/tutorials/views/hello-listview.html">List View</a></li> - <li><a href="{@docRoot}resources/tutorials/views/hello-gridview.html">Grid View</a></li> - </ol> </div> </div> @@ -81,8 +74,8 @@ mHistoryView.setOnItemClickListener(mMessageClickedHandler); </pre> <div class="special"> -<p>For more discussion on how to create different AdapterViews, read the following tutorials: -<a href="{@docRoot}resources/tutorials/views/hello-spinner.html">Hello Spinner</a>, -<a href="{@docRoot}resources/tutorials/views/hello-listview.html">Hello ListView</a>, and -<a href="{@docRoot}resources/tutorials/views/hello-gridview.html">Hello GridView</a>. +<p>For more discussion on how to create different AdapterViews, read the following guides: +<a href="{@docRoot}guide/topics/ui/controls/spinner.html">Spinner</a>, +<a href="{@docRoot}guide/topics/ui/layout/listview.html">List View</a>, and +<a href="{@docRoot}guide/topics/ui/layout/gridview.html">Grid View</a>. </div> diff --git a/docs/html/guide/topics/ui/ui-events.jd b/docs/html/guide/topics/ui/ui-events.jd index 707d4b1..6d41b15 100644 --- a/docs/html/guide/topics/ui/ui-events.jd +++ b/docs/html/guide/topics/ui/ui-events.jd @@ -13,10 +13,6 @@ parent.link=index.html <li><a href="#HandlingFocus">Handling Focus</a></li> </ol> - <h2>Related tutorials</h2> - <ol> - <li><a href="{@docRoot}resources/tutorials/views/hello-formstuff.html">Form Stuff</a></li> - </ol> </div> </div> diff --git a/docs/html/guide/webapps/webview.jd b/docs/html/guide/webapps/webview.jd index d2b2532..c87be06 100644 --- a/docs/html/guide/webapps/webview.jd +++ b/docs/html/guide/webapps/webview.jd @@ -33,11 +33,6 @@ layout</li> <li>{@link android.webkit.WebViewClient}</li> </ol> -<h2>Related tutorials</h2> -<ol> - <li><a href="{@docRoot}resources/tutorials/views/hello-webview.html">Web View</a></li> -</ol> - </div> </div> diff --git a/docs/html/images/home/io-extended-2013.png b/docs/html/images/home/io-extended-2013.png Binary files differnew file mode 100644 index 0000000..93989d4 --- /dev/null +++ b/docs/html/images/home/io-extended-2013.png diff --git a/docs/html/images/home/io-logo-2013.png b/docs/html/images/home/io-logo-2013.png Binary files differindex c95719e..1a200e1 100644 --- a/docs/html/images/home/io-logo-2013.png +++ b/docs/html/images/home/io-logo-2013.png diff --git a/docs/html/index.jd b/docs/html/index.jd index a0029b5..29d6a8f 100644 --- a/docs/html/index.jd +++ b/docs/html/index.jd @@ -14,17 +14,16 @@ page.metaDescription=The official site for Android developers. Provides the Andr <ul> <li class="item carousel-home"> <div class="content-left col-10"> - <img src="{@docRoot}images/home/io-logo-2013.png" style="margin:40px 0 0"> + <img src="{@docRoot}images/home/io-extended-2013.png" style="margin:90px 0 0"> </div> <div class="content-right col-5"> - <h1>Google I/O 2013</h1> - <p>Android will be at Google I/O on May 15-17, 2013, with sessions covering a variety of topics - such as design, performance, and how to extend your app with the latest Android features. - Registration opens on March 13, 2013 at 7:00 AM PDT (GMT-7).</p> - <p>For more information about event details and planned sessions, - stay tuned to <a - href="http://google.com/+GoogleDevelopers">+Google Developers</a>.</p> - <p><a href="https://developers.google.com/events/io/" class="button">Register here</a></p> + <h1>Google I/O Extended</h1> + <p>Android will be at Google I/O on May 15-17, 2013, with sessions covering topics + such as design, performance, and how to enhance your app with the latest Android features.</p> + <p>Even if you can't make it there, you can experience the excitement and innovation of + Google I/O remotely with Google I/O Extended.</p> + <p><a href="https://developers.google.com/events/io/io-extended/?utm_source=site&utm_medium=emb&utm_campaign=extended-android-site" + >Organize or attend an event near you »</a></p> </div> </li> <li class="item carousel-home"> diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 6307c69..315c977 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -4,25 +4,25 @@ header.hide=1 page.metaDescription=Download the official Android SDK to develop apps for Android-powered devices. -sdk.linux32_bundle_download=adt-bundle-linux-x86.zip -sdk.linux32_bundle_bytes=418614971 -sdk.linux32_bundle_checksum=24506708af221a887326c2a9ca9625dc +sdk.linux32_bundle_download=adt-bundle-linux-x86-20130219.zip +sdk.linux32_bundle_bytes=418664018 +sdk.linux32_bundle_checksum=e56ebb5c8eb84eb3227cf7c255373f4b -sdk.linux64_bundle_download=adt-bundle-linux-x86_64.zip -sdk.linux64_bundle_bytes=418889835 -sdk.linux64_bundle_checksum=464c1fbe92ea293d6b2292c27af5066a +sdk.linux64_bundle_download=adt-bundle-linux-x86_64-20130219.zip +sdk.linux64_bundle_bytes=418939098 +sdk.linux64_bundle_checksum=90cb420934170787938d0477c1a83a7f -sdk.mac64_bundle_download=adt-bundle-mac-x86_64.zip -sdk.mac64_bundle_bytes=390649300 -sdk.mac64_bundle_checksum=f557bc61a4bff466633037839771bffb +sdk.mac64_bundle_download=adt-bundle-mac-x86_64-20130219.zip +sdk.mac64_bundle_bytes=390697025 +sdk.mac64_bundle_checksum=b768c28f380c1846479664c4790e9c53 -sdk.win32_bundle_download=adt-bundle-windows-x86.zip -sdk.win32_bundle_bytes=425429957 -sdk.win32_bundle_checksum=cca97f12904774385a57d542e70a490f +sdk.win32_bundle_download=adt-bundle-windows-x86-20130219.zip +sdk.win32_bundle_bytes=425487608 +sdk.win32_bundle_checksum=4a40039f28048e6d7b2440adf55b8321 -sdk.win64_bundle_download=adt-bundle-windows-x86_64.zip -sdk.win64_bundle_bytes=425553759 -sdk.win64_bundle_checksum=c51679f4517e1c3ddefa1e662bbf17f6 +sdk.win64_bundle_download=adt-bundle-windows-x86_64-20130219.zip +sdk.win64_bundle_bytes=425611626 +sdk.win64_bundle_checksum=891f79816b4d19042faab26d670f4f77 diff --git a/docs/html/tools/debugging/ddms.jd b/docs/html/tools/debugging/ddms.jd index 3d6324b..f641aad 100644 --- a/docs/html/tools/debugging/ddms.jd +++ b/docs/html/tools/debugging/ddms.jd @@ -54,7 +54,7 @@ parent.link=index.html <p>When DDMS starts, it connects to <a href="{@docRoot}tools/help/adb.html">adb</a>. When a device is connected, a VM monitoring service is created between <code>adb</code> and DDMS, which notifies DDMS when a VM on the device is started or terminated. Once a VM - is running, DDMS retrieves the the VM's process ID (pid), via <code>adb</code>, and opens a connection to the + is running, DDMS retrieves the VM's process ID (pid), via <code>adb</code>, and opens a connection to the VM's debugger, through the adb daemon (adbd) on the device. DDMS can now talk to the VM using a custom wire protocol.</p> diff --git a/docs/html/tools/device.jd b/docs/html/tools/device.jd index 9bdaf47..c7827b2 100644 --- a/docs/html/tools/device.jd +++ b/docs/html/tools/device.jd @@ -30,7 +30,7 @@ device directly from Eclipse or from the command line with ADB. If you don't yet have a device, check with the service providers in your area to determine which Android-powered devices are available.</p> -<p>If you want a SIM-unlocked phone, then you might consider the Google Nexus S. To find a place +<p>If you want a SIM-unlocked phone, then you might consider a Nexus phone. To find a place to purchase the Nexus S and other Android-powered devices, visit <a href="http://www.google.com/phone/detail/nexus-s">google.com/phone</a>.</p> diff --git a/docs/html/tools/devices/emulator.jd b/docs/html/tools/devices/emulator.jd index cee6473..bae3985 100644 --- a/docs/html/tools/devices/emulator.jd +++ b/docs/html/tools/devices/emulator.jd @@ -1254,7 +1254,7 @@ syntax for this command is as follows: </p> <td> </td> </tr> <tr> - <td><code>power health <percent></code></td> + <td><code>capacity <percent></code></td> <td>Set remaining battery capacity state (0-100).</td> <td> </td> </tr> diff --git a/docs/html/tools/extras/support-library.jd b/docs/html/tools/extras/support-library.jd index 08ac172..6475e3c 100644 --- a/docs/html/tools/extras/support-library.jd +++ b/docs/html/tools/extras/support-library.jd @@ -46,10 +46,33 @@ by the directory name, such as {@code v4/} and {@code v13/}.</p> <p>The sections below provide notes about successive releases of the Support Package, as denoted by revision number.</p> - <div class="toggle-content opened"> <p><a href="#" onclick="return toggleContent(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" alt="" +/>Support Package, revision 12</a> <em>(February 2013)</em> + </p> + <div class="toggle-content-toggleme"> + <dl> + <dt>Changes for v4 support library:</dt> + <dd> + <ul> + <li>Improved interaction behavior for {@link android.support.v4.view.ViewPager}.</li> + <li>Fixed a bug that could cause {@link android.support.v4.view.ViewPager} to select the + wrong page.</li> + <li>Fixed use of {@link android.support.v4.view.ViewPager#removeView removeView()} method + during layout for {@link android.support.v4.view.ViewPager}.</li> + <li>Fixed issue with {@link android.support.v4.widget.SearchViewCompat} where using the + back button to dismiss does not clear the search text. This fix only applies to + host API levels 14 and higher.</li> + </ul> + </dd> + </dl> + </div> +</div> + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" alt="" />Support Package, revision 11</a> <em>(November 2012)</em> </p> <div class="toggle-content-toggleme"> @@ -119,7 +142,7 @@ the Support Package, as denoted by revision number.</p> <dt>Changes for v4 support library:</dt> <dd> <ul> - <li>Added support for notification features introduced in Android 4.1 (API Level 16) with + <li>Added support for notification features introduced in Android 4.1 (API level 16) with additions to {@link android.support.v4.app.NotificationCompat}.</li> </ul> </dd> @@ -210,7 +233,7 @@ isActiveNetworkMetered()} method.</li> <li>Fixed intent flags for {@link android.app.PendingIntent} objects generated by {@link android.support.v4.app.TaskStackBuilder}.</li> <li>Removed unused attributes from the gridlayout library projects to make sure - the library can be built with API Level 7 and higher.</li> + the library can be built with API level 7 and higher.</li> <li>Added {@code .classpath} and {@code .project} files for the gridlayout library project.</li> </ul> diff --git a/docs/html/tools/projects/index.jd b/docs/html/tools/projects/index.jd index 6a49ac9..439d3be 100644 --- a/docs/html/tools/projects/index.jd +++ b/docs/html/tools/projects/index.jd @@ -68,12 +68,12 @@ page.title=Managing Projects <code>src<em>/your/package/namespace/ActivityName</em>.java</code>. All other source code files (such as <code>.java</code> or <code>.aidl</code> files) go here as well.</dd> - <dt><code>bin</code></dt> + <dt><code>bin/</code></dt> <dd>Output directory of the build. This is where you can find the final <code>.apk</code> file and other compiled resources.</dd> - <dt><code>jni</code></dt> + <dt><code>jni/</code></dt> <dd>Contains native code sources developed using the Android NDK. For more information, see the <a href="{@docRoot}tools/sdk/ndk/index.html">Android NDK documentation</a>.</dd> @@ -88,7 +88,7 @@ page.title=Managing Projects <dd>This is empty. You can use it to store raw asset files. Files that you save here are compiled into an <code>.apk</code> file as-is, and the original filename is preserved. You can navigate this directory in the same way as a typical file system using URIs and read files as a stream of - bytes using the the {@link android.content.res.AssetManager}. For example, this is a good + bytes using the {@link android.content.res.AssetManager}. For example, this is a good location for textures and game data.</dd> <dt><code>res/</code></dt> @@ -114,7 +114,7 @@ page.title=Managing Projects <dt><code>drawable/</code></dt> <dd>For bitmap files (PNG, JPEG, or GIF), 9-Patch image files, and XML files that describe - Drawable shapes or a Drawable objects that contain multiple states (normal, pressed, or + Drawable shapes or Drawable objects that contain multiple states (normal, pressed, or focused). See the <a href= "{@docRoot}guide/topics/resources/drawable-resource.html">Drawable</a> resource type.</dd> @@ -251,7 +251,7 @@ used.</dd> code and resources as a standard Android project, stored in the same way. For example, source code in the library project can access its own resources through its <code>R</code> class.</p> - <p>However, a library project differs from an standard Android application project in that you + <p>However, a library project differs from a standard Android application project in that you cannot compile it directly to its own <code>.apk</code> and run it on an Android device. Similarly, you cannot export the library project to a self-contained JAR file, as you would do for a true library. Instead, you must compile the library indirectly, by referencing the diff --git a/docs/html/tools/revisions/platforms.jd b/docs/html/tools/revisions/platforms.jd index c1bc185..31cec0e 100644 --- a/docs/html/tools/revisions/platforms.jd +++ b/docs/html/tools/revisions/platforms.jd @@ -44,11 +44,28 @@ version.</p> SDK tools to revision 20 or later and restart the Android SDK Manager. If you do not, the Android 4.2 system components will not be available for download.</p> - <div class="toggle-content opened"> <p><a href="#" onclick="return toggleContent(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" +class="toggle-content-img" alt="" />Revision 2</a> <em>(February 2013)</em> + </p> + + <div class="toggle-content-toggleme"> + + <p>Maintenance update. The system version is 4.2.2.</p> + <dl> + <dt>Dependencies:</dt> + <dd>SDK Tools r21 or higher is required.</dd> + </dl> + + </div> +</div> + +<div class="toggle-content closed"> + + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" alt="" />Revision 1</a> <em>(November 2012)</em> </p> diff --git a/docs/html/tools/sdk/eclipse-adt.jd b/docs/html/tools/sdk/eclipse-adt.jd index 4adb7b2..a3f53bb 100644 --- a/docs/html/tools/sdk/eclipse-adt.jd +++ b/docs/html/tools/sdk/eclipse-adt.jd @@ -69,7 +69,7 @@ href="http://tools.android.com/knownissues">http://tools.android.com/knownissues <li>Java 1.6 or higher is required for ADT 21.1.0.</li> <li>Eclipse Helios (Version 3.6.2) or higher is required for ADT 21.1.0.</li> <li>ADT 21.1.0 is designed for use with <a href="{@docRoot}tools/sdk/tools-notes.html">SDK - Tools r21.1.0</a>. If you haven't already installed SDK Tools r21.1.0 into your SDK, use the + Tools r21.1</a>. If you haven't already installed SDK Tools r21.1 into your SDK, use the Android SDK Manager to do so.</li> </ul> </dd> diff --git a/docs/html/tools/sdk/ndk/index.jd b/docs/html/tools/sdk/ndk/index.jd index cb4954b..74caaf4 100644 --- a/docs/html/tools/sdk/ndk/index.jd +++ b/docs/html/tools/sdk/ndk/index.jd @@ -1,17 +1,29 @@ ndk=true page.template=sdk -ndk.win_download=android-ndk-r8d-windows.zip -ndk.win_bytes=327014028 -ndk.win_checksum=d78ec3d4ec15ad3b18b9f488a5763c23 +ndk.mac64_download=android-ndk-r8e-darwin-x86_64.tar.bz2 +ndk.mac64_bytes=508419298 +ndk.mac64_checksum=efac96fab20e6ddb1311d6ba5648ce72 -ndk.mac_download=android-ndk-r8d-darwin-x86.tar.bz2 -ndk.mac_bytes=308328942 -ndk.mac_checksum=5cd9ef9fb7e03943ee8c9e147e42e571 +ndk.mac32_download=android-ndk-r8e-darwin-x86.tar.bz2 +ndk.mac32_bytes=496238878 +ndk.mac32_checksum=e17e707464c45c0d5615e4d0ae6a5cf7 -ndk.linux_download=android-ndk-r8d-linux-x86.tar.bz2 -ndk.linux_bytes=254644383 -ndk.linux_checksum=e1fa0379a3feb59f2f0865f1a90bd382 +ndk.linux64_download=android-ndk-r8e-linux-x86_64.tar.bz2 +ndk.linux64_bytes=466853553 +ndk.linux64_checksum=fa812352956067e7a9eefc0274675e9a + +ndk.linux32_download=android-ndk-r8e-linux-x86.tar.bz2 +ndk.linux32_bytes=461526099 +ndk.linux32_checksum=26d774b0884bcd98de08eb4de41ab532 + +ndk.win64_download=android-ndk-r8e-windows-x86_64.zip +ndk.win64_bytes=461298980 +ndk.win64_checksum=11eb99b3b56fc86d9d231ebff5c41db3 + +ndk.win32_download=android-ndk-r8e-windows-x86.zip +ndk.win32_bytes=434701805 +ndk.win32_checksum=fb41ed2bff5610b14a7b6f085ab86213 page.title=Android NDK @jd:body @@ -250,6 +262,222 @@ the NDK, as denoted by revision number. </p> <div class="toggle-content opened"> <p><a href="#" onclick="return toggleContent(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" + alt="">Android NDK, Revision 8e</a> <em>(March 2013)</em> + </p> + + <div class="toggle-content-toggleme"> + <dl> + <dt>Important changes:</dt> + <dd> + <ul> + <li>Added 64-bit host toolchain set (package name suffix {@code *-x86_64.*}). For more + information, see {@code CHANGES.HTML} and {@code NDK-BUILD.html}.</li> + <li>Added Clang 3.2 compiler. GCC 4.6 is still the default. For information on using the + Clang compiler, see {@code CHANGES.HTML}.</li> + <li>Added static code analyzer for Linux/MacOSX hosts. For information on using the + analyzer, see {@code CHANGES.HTML}.</li> + <li>Added MCLinker for Linux/MacOSX hosts as an experimental feature. The {@code ld.gold} + linker is the default where available, so you must explicitly enable it. For more + information, see {@code CHANGES.HTML}.</li> + <li>Updated ndk-build to use topological sort for module dependencies, which means the + build automatically sorts out the order of libraries specified in + {@code LOCAL_STATIC_LIBRARIES}, {@code LOCAL_WHOLE_STATIC_LIBRARIES} and + {@code LOCAL_SHARED_LIBRARIES}. For more information, see {@code CHANGES.HTML}. + (<a href="http://code.google.com/p/android/issues/detail?id=39378">Issue 39378</a>)</li> + </ul> + </dd> + + <dt>Important bug fixes:</dt> + <dd> + <ul> + <li>Fixed build script to build all toolchains in {@code -O2}. Toolchains in previous + releases were incorrectly built without optimization.</li> + <li>Fixed build script which unconditionally builds Clang/llvm for MacOSX in 64-bit.</li> + <li>Fixed GCC 4.6/4.7 internal compiler error: + {@code gen_thumb_movhi_clobber at config/arm/arm.md:5832}. + (<a href="http://code.google.com/p/android/issues/detail?id=52732">Issue 52732</a>)</li> + <li>Fixed build problem where GCC/ARM 4.6/4.7 fails to link code using 64-bit atomic + built-in functions. + (<a href="http://code.google.com/p/android/issues/detail?id=41297">Issue 41297</a>)</li> + <li>Fixed GCC 4.7 linker DIV usage mismatch errors. + (<a href="http://sourceware.org/ml/binutils/2012-12/msg00202.html">Sourceware Issue</a>) + <li>Fixed GCC 4.7 internal compiler error {@code build_data_member_initialization, at + cp/semantics.c:5790}.</li> + <li>Fixed GCC 4.7 internal compiler error {@code redirect_eh_edge_1, at tree-eh.c:2214}. + (<a href="http://code.google.com/p/android/issues/detail?id=52909">Issue 52909</a>)</li> + <li>Fixed a GCC 4.7 segfault. + (<a href="http://gcc.gnu.org/bugzilla/show_bug.cgi?id=55245">GCC Issue</a>)</li> + <li>Fixed {@code <chrono>} clock resolution and enabled {@code steady_clock}. + (<a href="http://code.google.com/p/android/issues/detail?id=39680">Issue 39680</a>)</li> + <li>Fixed toolchain to enable {@code _GLIBCXX_HAS_GTHREADS} for GCC 4.7 libstdc++. + (<a href="http://code.google.com/p/android/issues/detail?id=41770">Issue 41770</a>, + <a href="http://code.google.com/p/android/issues/detail?id=41859">Issue 41859</a>)</li> + <li>Fixed problem with the X86 MXX/SSE code failing to link due to missing + {@code posix_memalign}. + (<a href="https://android-review.googlesource.com/#/c/51872">Change 51872</a>)</li> + <li>Fixed GCC4.7/X86 segmentation fault in {@code i386.c}, function + {@code distance_non_agu_define_in_bb()}. + (<a href="https://android-review.googlesource.com/#/c/50383">Change 50383</a>)</li> + <li>Fixed GCC4.7/X86 to restore earlier {@code cmov} behavior. + (<a href="http://gcc.gnu.org/viewcvs?view=revision&revision=193554">GCC Issue</a>)</li> + <li>Fixed handling NULL return value of {@code setlocale()} in libstdc++/GCC4.7. + (<a href="http://code.google.com/p/android/issues/detail?id=46718">Issue 46718</a>) + <li>Fixed {@code ld.gold} runtime undefined reference to {@code __exidx_start} and + {@code __exidx_start_end}. + (<a href="https://android-review.googlesource.com/#/c/52134">Change 52134</a>)</li> + <li>Fixed Clang 3.1 internal compiler error when using Eigen library. + (<a href="http://code.google.com/p/android/issues/detail?id=41246">Issue 41246</a>)</li> + <li>Fixed Clang 3.1 internal compiler error including {@code <chrono>} in C++11 mode. + (<a href="http://code.google.com/p/android/issues/detail?id=39600">Issue 39600</a>)</li> + <li>Fixed Clang 3.1 internal compiler error when generating object code for a method + call to a uniform initialized {@code rvalue}. + (<a href="http://code.google.com/p/android/issues/detail?id=41387">Issue 41387</a>)</li> + <li>Fixed Clang 3.1/X86 stack realignment. + (<a href="https://android-review.googlesource.com/#/c/52154">Change 52154</a>)</li> + <li>Fixed problem with GNU Debugger (GDB) SIGILL when debugging on Android 4.1.2. + (<a href="http://code.google.com/p/android/issues/detail?id=40941">Issue 40941</a>)</li> + <li>Fixed problem where GDB cannot set {@code source:line} breakpoints when symbols contain + long, indirect file paths. + (<a href="http://code.google.com/p/android/issues/detail?id=42448">Issue 42448</a>)</li> + <li>Fixed GDB {@code read_program_header} for MIPS PIE executables. + (<a href="https://android-review.googlesource.com/#/c/49592">Change 49592</a>)</li> + <li>Fixed {@code STLport} segmentation fault in {@code uncaught_exception()}. + (<a href="https://android-review.googlesource.com/#/c/50236">Change 50236</a>)</li> + <li>Fixed {@code STLport} bus error in exception handling due to unaligned access of + {@code DW_EH_PE_udata2}, {@code DW_EH_PE_udata4}, and {@code DW_EH_PE_udata8}.</li> + <li>Fixed Gabi++ infinite recursion problem with {@code nothrow new[]} operator. + (<a href="http://code.google.com/p/android/issues/detail?id=52833">Issue 52833</a>)</li> + <li>Fixed Gabi++ wrong offset to exception handler pointer. + (<a href="https://android-review.googlesource.com/#/c/53446">Change 53446</a>)</li> + <li>Removed Gabi++ redundant free on exception object + (<a href="https://android-review.googlesource.com/#/c/53447">Change 53447</a>)</li> + </ul> + </dd> + + <dt>Other bug fixes:</dt> + <dd> + <ul> + <li>Fixed NDK headers: + <ul> + <li>Removed redundant definitions of {@code size_t}, {@code ssize_t}, and + {@code ptrdiff_t}.</li> + <li>Fixed MIPS and ARM {@code fenv.h} header.</li> + <li>Fixed {@code stddef.h} to not redefine {@code offsetof} since it already exists + in the toolchain.</li> + <li>Fixed {@code elf.h} to contain {@code Elf32_auxv_t} and {@code Elf64_auxv_t}. + (<a href="http://code.google.com/p/android/issues/detail?id=38441">Issue 38441</a>) + </li> + <li>Fixed the {@code #ifdef} C++ definitions in the + {@code OpenSLES_AndroidConfiguration.h} header file. + (<a href="http://code.google.com/p/android/issues/detail?id=53163">Issue 53163</a>) + </li> + </ul> + </li> + <li>Fixed {@code STLport} to abort after out of memory error instead of silently exiting. + </li> + <li>Fixed system and Gabi++ headers to be able to compile with API level 8 and lower.</li> + <li>Fixed {@code cpufeatures} to not parse {@code /proc/self/auxv}. + (<a href="http://code.google.com/p/android/issues/detail?id=43055">Issue 43055</a>)</li> + <li>Fixed {@code ld.gold} to not depend on host libstdc++ and on Windows platforms, + to not depend on the {@code libgcc_sjlj_1.dll} library.</li> + <li>Fixed Clang 3.1 which emits inconsistent register list in {@code .vsave} and fails + assembler. + (<a href="https://android-review.googlesource.com/#/c/49930">Change 49930</a>)</li> + <li>Fixed Clang 3.1 to be able to compile libgabi++ and pass the {@code test-stlport} + tests for MIPS build targets. + (<a href="https://android-review.googlesource.com/#/c/51961">Change 51961</a>)</li> + <li>Fixed Clang 3.1 to only enable exception by default for C++, not for C.</li> + <li>Fixed several issues in Clang 3.1 to pass most GNU exception tests.</li> + <li>Fixed scripts {@code clang} and {@code clang++} in standalone NDK compiler to detect + {@code -cc1} and to not specify {@code -target} when found.</li> + <li>Fixed {@code ndk-build} to observe {@code NDK_APP_OUT} set in {@code Application.mk}. + </li> + <li>Fixed X86 {@code libc.so} and {@code lib.a} which were missing the {@code sigsetjmp} + and {@code siglongjmp} functions already declared in {@code setjmp.h}. + (<a href="http://code.google.com/p/android/issues/detail?id=19851">Issue 19851</a>)</li> + <li>Patched GCC 4.4.3/4.6/4.7 libstdc++ to work with Clang in C++ 11. + (<a href="http://clang.llvm.org/cxx_status.html">Clang Issue</a>)</li> + <li>Fixed cygwin path in argument passed to {@code HOST_AWK}.</li> + <li>Fixed {@code ndk-build} script warning in windows when running from project's JNI + directory. + (<a href="http://code.google.com/p/android/issues/detail?id=40192">Issue 40192</a>)</li> + <li>Fixed problem where the {@code ndk-build} script does not build if makefile has + trailing whitespace in the {@code LOCAL_PATH} definition. + (<a href="http://code.google.com/p/android/issues/detail?id=42841">Issue 42841</a>)</li> + </ul> + </dd> + + <dt>Other changes:</dt> + <dd> + <ul> + <li>Enabled threading support in GCC/MIPS toolchain.</li> + <li>Updated GCC exception handling helpers {@code __cxa_begin_cleanup} and + {@code __cxa_type_match} to have <em>default</em> visibility from the previous + <em>hidden</em> visibility in GNU libstdc++. For more information, see + {@code CHANGES.HTML}.</li> + <li>Updated build scripts so that Gabi++ and STLport static libraries are now built with + hidden visibility except for exception handling helpers.</li> + <li>Updated build so that {@code STLport} is built for ARM in Thumb mode.</li> + <li>Added support for {@code std::set_new_handler} in Gabi++. + (<a href="http://code.google.com/p/android/issues/detail?id=52805">Issue 52805</a>)</li> + <li>Enabled {@code FUTEX} system call in GNU libstdc++.</li> + <li>Updated {@code ndk-build} so that it no longer copies prebuilt static library to + a project's {@code obj/local/<abi>/} directory. + (<a href="http://code.google.com/p/android/issues/detail?id=40302">Issue 40302</a>)</li> + <li>Removed {@code __ARM_ARCH_5*__} from ARM {@code toolchains/*/setup.mk} script. + (<a href="http://code.google.com/p/android/issues/detail?id=21132">Issue 21132</a>)</li> + <li>Built additional GNU libstdc++ libraries in thumb for ARM.</li> + <li>Enabled MIPS floating-point {@code madd/msub/nmadd/nmsub/recip/rsqrt} + instructions with 32-bit FPU.</li> + <li>Enabled graphite loop optimizer in GCC 4.6 and 4.7 to allow more optimizations: + {@code -fgraphite}, {@code -fgraphite-identity}, {@code -floop-block}, {@code -floop-flatten}, + {@code -floop-interchange}, {@code -floop-strip-mine}, {@code -floop-parallelize-all}, + and {@code -ftree-loop-linear}. + (<a href="http://gcc.gnu.org/onlinedocs/gcc/Optimize-Options.html">info</a>)</li> + <li>Enabled {@code polly} for Clang 3.1 on Linux and Max OS X 32-bit hosts which analyzes + and optimizes memory access. (<a href="http://polly.llvm.org">info</a>)</li> + <li>Enabled {@code -flto} in GCC 4.7, 4.6, Clang 3.2 and Clang 3.1 on linux (Clang LTO + via LLVMgold.so). MIPS compiler targets are not supported because {@code ld.gold} + is not available.</li> + <li>Enabled {@code --plugin} and {@code --plugin-opt} for {@code ld.gold} in GCC 4.6/4.7. + </li> + <li>Enabled {@code --text-reorder} for {@code ld.gold} in GCC 4.7.</li> + <li>Configured GNU libstdc++ with {@code _GLIBCXX_USE_C99_MATH} which undefines the + {@code isinf} script in the bionic header. For more information, see + {@code CHANGES.html}.</li> + <li>Added {@code APP_LDFLAGS} to the build scripts. For more information, see + {@code ANDROID-MK.html}.</li> + <li>Updated build scripts to allow {@code NDK_LOG=0} to disable the {@code NDK_LOG}.</li> + <li>Updated build scripts to allow {@code NDK_HOST_32BIT=0} to disable the host developer + environment 32-bit toolchain.</li> + <li>Changed the default GCC/X86 flags {@code -march=} and {@code -mtune=} from + {@code pentiumpro} and {@code generic} to {@code i686} and {@code atom}.</li> + <li>Enhanced toolchain build scripts: + <ul> + <li>Fixed a race condition in {@code build-gcc.sh} for the {@code mingw} build type + which was preventing a significant amount of parallel build processing.</li> + <li>Updated {@code build-gabi++.sh} and {@code build-stlport.sh} so they can now run + from the NDK package. + (<a href="http://code.google.com/p/android/issues/detail?id=52835">Issue 52835</a>) + </li> + <li>Fixed {@code run-tests.sh} in the {@code MSys} utilities collection.</li> + <li>Improved 64-bit host toolchain and Canadian Cross build support.</li> + <li>Updated {@code build-mingw64-toolchain.sh} script to more recent version.</li> + <li>Added option to build {@code libgnustl_static.a} and {@code stlport_static.a} + without hidden visibility.</li> + </ul> + </li> + </ul> + + </dd> + </dl> + </div> +</div> + + +<div class="toggle-content closed"> + <p><a href="#" onclick="return toggleContent(this)"> + <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img" alt="">Android NDK, Revision 8d</a> <em>(December 2012)</em> </p> @@ -769,7 +997,7 @@ MIPS.</li> <dd> <ul> <li>Added GCC 4.6 toolchain ({@code binutils} 2.21 with {@code gold} and GDB 7.3.x) to -co-exist with the original GCC 4.4.3 toolchain ({@code binutils} 2.19 and GDB 6.6).</p> +co-exist with the original GCC 4.4.3 toolchain ({@code binutils} 2.19 and GDB 6.6). <ul> <li>GCC 4.6 is now the default toolchain. You may set {@code NDK_TOOLCHAIN_VERSION=4.4.3} in {@code Application.mk} to select the original one.</li> @@ -816,8 +1044,9 @@ assembler and {@code -z execstack} for the linker.</li> following options: <pre> LOCAL_DISABLE_NO_EXECUTE=true # disable "--noexecstack" and "-z noexecstack" -DISABLE_RELRO=true # disable "-z relro" and "-z now"</li> +DISABLE_RELRO=true # disable "-z relro" and "-z now" </pre> + </li> </ol> <p>See {@code docs/ANDROID-MK.html} for more details.</p> </li> @@ -826,7 +1055,7 @@ DISABLE_RELRO=true # disable "-z relro" and "-z now"</li> <li>Added branding for Android executables with the {@code .note.ABI-tag} section (in {@code crtbegin_static/dynamic.o}) so that debugging tools can act accordingly. The structure -member and values are defined as follows:</p> +member and values are defined as follows: <pre> static const struct { int32_t namesz; /* = 4, sizeof ("GNU") */ @@ -1621,10 +1850,11 @@ float AMotionEvent_getHistoricalRawY(const AInputEvent* motion_event, <li>Fixed a bug that caused the build to fail if <code>LOCAL_ARM_NEON</code> was set to true (typo in <code>build/core/build-binary.mk</code>).</li> - <li>Fixed a bug that prevented the compilation of </code>.s</code> assembly files + <li>Fixed a bug that prevented the compilation of <code>.s</code> assembly files (<code>.S</code> files were okay).</li> </ul> </dd> + </dl> </div> </div> diff --git a/docs/html/tools/sdk/tools-notes.jd b/docs/html/tools/sdk/tools-notes.jd index a5b7eee..7d121844 100644 --- a/docs/html/tools/sdk/tools-notes.jd +++ b/docs/html/tools/sdk/tools-notes.jd @@ -28,7 +28,7 @@ href="http://tools.android.com/knownissues">http://tools.android.com/knownissues <div class="toggle-content opened"> <p><a href="#" onclick="return toggleContent(this)"> <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img" - alt=""/>SDK Tools, Revision 21.1.0</a> <em>(February 2013)</em> + alt=""/>SDK Tools, Revision 21.1</a> <em>(February 2013)</em> </p> <div class="toggle-content-toggleme"> @@ -38,7 +38,7 @@ href="http://tools.android.com/knownissues">http://tools.android.com/knownissues <dd> <ul> <li>Android SDK Platform-tools revision 16 or later.</li> - <li>If you are developing in Eclipse with ADT, note that the SDK Tools r21.1.0 is + <li>If you are developing in Eclipse with ADT, note that the SDK Tools r21.1 is designed for use with ADT 21.1.0 and later. If you haven't already, update your <a href="{@docRoot}tools/sdk/eclipse-adt.html">ADT Plugin</a> to 21.1.0.</li> <li>If you are developing outside Eclipse, you must have diff --git a/docs/html/tools/testing/testing_android.jd b/docs/html/tools/testing/testing_android.jd index acf5ec2..10843e8 100755 --- a/docs/html/tools/testing/testing_android.jd +++ b/docs/html/tools/testing/testing_android.jd @@ -111,14 +111,14 @@ parent.link=index.html </li> <li> The SDK tools for building and tests are available in Eclipse with ADT, and also in - command-line form for use with other IDES. These tools get information from the project of + command-line form for use with other IDEs. These tools get information from the project of the application under test and use this information to automatically create the build files, manifest file, and directory structure for the test package. </li> <li> The SDK also provides <a href="{@docRoot}tools/help/monkeyrunner_concepts.html">monkeyrunner</a>, an API - testing devices with Python programs, and <a + for testing devices with Python programs, and <a href="{@docRoot}tools/help/monkey.html">UI/Application Exerciser Monkey</a>, a command-line tool for stress-testing UIs by sending pseudo-random events to a device. </li> diff --git a/docs/html/tools/testing/testing_otheride.jd b/docs/html/tools/testing/testing_otheride.jd index 0678f52..9484158 100644 --- a/docs/html/tools/testing/testing_otheride.jd +++ b/docs/html/tools/testing/testing_otheride.jd @@ -75,9 +75,9 @@ parent.link=index.html <p> You use the <code>android</code> tool to create test projects. You also use <code>android</code> to convert existing test code into an Android test project, - or to add the <code>run-tests</code> Ant target to an existing Android test project. + or to add the <code>test</code> Ant target to an existing Android test project. These operations are described in more detail in the section <a href="#UpdateTestProject"> - Updating a test project</a>. The <code>run-tests</code> target is described in + Updating a test project</a>. The <code>test</code> target is described in <a href="#RunTestsAnt">Quick build and run with Ant</a>. </p> <h3 id="CreateTestProject">Creating a test project</h3> @@ -300,7 +300,7 @@ $ android create test-project -m ../HelloAndroid -n HelloAndroidTest -p HelloAnd <h3 id="RunTestsAnt">Quick build and run with Ant</h3> <p> You can use Ant to run all the tests in your test project, using the target - <code>run-tests</code>, which is created automatically when you create a test project with + <code>test</code>, which is created automatically when you create a test project with the <code>android</code> tool. </p> <p> diff --git a/docs/html/tools/workflow/index.jd b/docs/html/tools/workflow/index.jd index 5ae06e6..784b212 100644 --- a/docs/html/tools/workflow/index.jd +++ b/docs/html/tools/workflow/index.jd @@ -34,7 +34,7 @@ development steps encompass four development phases, which include:</p> </li> <li><strong>Development</strong> <p>During this phase you set up and develop your Android project, which contains all of the - source code and resource files for your application. For more informations, see + source code and resource files for your application. For more information, see <a href="{@docRoot}tools/projects/index.html">Create an Android project</a>.</p> </li> <li><strong>Debugging and Testing</strong> diff --git a/docs/html/training/animation/index.jd b/docs/html/training/animation/index.jd index 9cc7e6c..b2815fc 100644 --- a/docs/html/training/animation/index.jd +++ b/docs/html/training/animation/index.jd @@ -1,4 +1,5 @@ page.title=Adding Animations +page.tags="animation","views","layout","user interface" trainingnavtop=true startpage=true diff --git a/docs/html/training/basics/data-storage/databases.jd b/docs/html/training/basics/data-storage/databases.jd index fbefce4..61fb758 100644 --- a/docs/html/training/basics/data-storage/databases.jd +++ b/docs/html/training/basics/data-storage/databases.jd @@ -1,6 +1,4 @@ page.title=Saving Data in SQL Databases -parent.title=Data Storage -parent.link=index.html trainingnavtop=true previous.title=Saving Data in Files diff --git a/docs/html/training/basics/data-storage/files.jd b/docs/html/training/basics/data-storage/files.jd index dd081a6..52bea4c 100644 --- a/docs/html/training/basics/data-storage/files.jd +++ b/docs/html/training/basics/data-storage/files.jd @@ -1,6 +1,4 @@ page.title=Saving Files -parent.title=Data Storage -parent.link=index.html trainingnavtop=true diff --git a/docs/html/training/basics/data-storage/index.jd b/docs/html/training/basics/data-storage/index.jd index 4334936..4ccad75 100644 --- a/docs/html/training/basics/data-storage/index.jd +++ b/docs/html/training/basics/data-storage/index.jd @@ -1,4 +1,5 @@ page.title=Saving Data +page.tags="data storage","files","sql","database","preferences" trainingnavtop=true startpage=true diff --git a/docs/html/training/basics/data-storage/shared-preferences.jd b/docs/html/training/basics/data-storage/shared-preferences.jd index 099da67..a6717c4 100644 --- a/docs/html/training/basics/data-storage/shared-preferences.jd +++ b/docs/html/training/basics/data-storage/shared-preferences.jd @@ -1,6 +1,4 @@ page.title=Saving Key-Value Sets -parent.title=Data Storage -parent.link=index.html trainingnavtop=true diff --git a/docs/html/training/basics/fragments/communicating.jd b/docs/html/training/basics/fragments/communicating.jd index eb9b368..b30045d 100644 --- a/docs/html/training/basics/fragments/communicating.jd +++ b/docs/html/training/basics/fragments/communicating.jd @@ -1,10 +1,6 @@ page.title=Communicating with Other Fragments -parent.title=Building a Dynamic UI with Fragments -parent.link=index.html trainingnavtop=true -previous.title=Building a Flexible UI -previous.link=fragment-ui.html @jd:body diff --git a/docs/html/training/basics/fragments/creating.jd b/docs/html/training/basics/fragments/creating.jd index 0646230..b5df4e1 100644 --- a/docs/html/training/basics/fragments/creating.jd +++ b/docs/html/training/basics/fragments/creating.jd @@ -1,12 +1,6 @@ page.title=Creating a Fragment -parent.title=Building a Dynamic UI with Fragments -parent.link=index.html trainingnavtop=true -previous.title=Using the Android Support Library -previous.link=support-lib.html -next.title=Building a Flexible UI -next.link=fragment-ui.html @jd:body diff --git a/docs/html/training/basics/fragments/fragment-ui.jd b/docs/html/training/basics/fragments/fragment-ui.jd index 1e134ca..db3119b 100644 --- a/docs/html/training/basics/fragments/fragment-ui.jd +++ b/docs/html/training/basics/fragments/fragment-ui.jd @@ -1,12 +1,6 @@ page.title=Building a Flexible UI -parent.title=Building a Dynamic UI with Fragments -parent.link=index.html trainingnavtop=true -previous.title=Create a Fragment -previous.link=creating.html -next.title=Communicating with Other Fragments -next.link=communicating.html @jd:body diff --git a/docs/html/training/basics/fragments/index.jd b/docs/html/training/basics/fragments/index.jd index bc93f43..1b82f2c 100644 --- a/docs/html/training/basics/fragments/index.jd +++ b/docs/html/training/basics/fragments/index.jd @@ -1,9 +1,8 @@ page.title=Building a Dynamic UI with Fragments +page.tags="fragments", "user interface", "support library" trainingnavtop=true startpage=true -next.title=Using the Android Support Library -next.link=support-lib.html @jd:body diff --git a/docs/html/training/basics/fragments/support-lib.jd b/docs/html/training/basics/fragments/support-lib.jd index cc867d3..b097de1 100644 --- a/docs/html/training/basics/fragments/support-lib.jd +++ b/docs/html/training/basics/fragments/support-lib.jd @@ -1,10 +1,7 @@ page.title=Using the Support Library -parent.title=Building a Dynamic UI with Fragments -parent.link=index.html +page.tags="support library" trainingnavtop=true -next.title=Creating a Fragment -next.link=creating.html @jd:body diff --git a/docs/html/training/basics/intents/index.jd b/docs/html/training/basics/intents/index.jd index d94ff01..8876a33 100644 --- a/docs/html/training/basics/intents/index.jd +++ b/docs/html/training/basics/intents/index.jd @@ -1,9 +1,8 @@ page.title=Interacting with Other Apps +page.tags="intents","activity" trainingnavtop=true startpage=true -next.title=Sending the User to Another App -next.link=sending.html @jd:body diff --git a/docs/html/training/basics/intents/result.jd b/docs/html/training/basics/intents/result.jd index 0086913..24ecc46 100644 --- a/docs/html/training/basics/intents/result.jd +++ b/docs/html/training/basics/intents/result.jd @@ -62,7 +62,7 @@ app can properly identify the result and determine how to handle it.</p> static final int PICK_CONTACT_REQUEST = 1; // The request code ... private void pickContact() { - Intent pickContactIntent = new Intent(Intent.ACTION_PICK, new Uri("content://contacts")); + Intent pickContactIntent = new Intent(Intent.ACTION_PICK, Uri.parse("content://contacts")); pickContactIntent.setType(Phone.CONTENT_TYPE); // Show user only contacts w/ phone numbers startActivityForResult(pickContactIntent, PICK_CONTACT_REQUEST); } diff --git a/docs/html/training/basics/network-ops/index.jd b/docs/html/training/basics/network-ops/index.jd index b213c03..cb3a390 100644 --- a/docs/html/training/basics/network-ops/index.jd +++ b/docs/html/training/basics/network-ops/index.jd @@ -1,4 +1,5 @@ page.title=Performing Network Operations +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 49ea81d..1e3eb42 100644 --- a/docs/html/training/basics/supporting-devices/index.jd +++ b/docs/html/training/basics/supporting-devices/index.jd @@ -1,9 +1,8 @@ page.title=Supporting Different Devices +page.tags="resources","screens","versions","localization" trainingnavtop=true startpage=true -next.title=Supporting Multiple Languages -next.link=languages.html @jd:body diff --git a/docs/html/training/camera/index.jd b/docs/html/training/camera/index.jd index 282bed8..fa754a0 100644 --- a/docs/html/training/camera/index.jd +++ b/docs/html/training/camera/index.jd @@ -1,4 +1,5 @@ page.title=Capturing Photos +page.tags="camera","video" trainingnavtop=true startpage=true diff --git a/docs/html/training/cloudsync/index.jd b/docs/html/training/cloudsync/index.jd index 91885e8..55b275b 100644 --- a/docs/html/training/cloudsync/index.jd +++ b/docs/html/training/cloudsync/index.jd @@ -1,9 +1,8 @@ page.title=Syncing to the Cloud +page.tags="cloud","sync","backup" trainingnavtop=true startpage=true -next.title=Making the Most of Google Cloud Messaging -next.link=gcm.html @jd:body diff --git a/docs/html/training/connect-devices-wirelessly/index.jd b/docs/html/training/connect-devices-wirelessly/index.jd index 37cf633..f27b9c3 100644 --- a/docs/html/training/connect-devices-wirelessly/index.jd +++ b/docs/html/training/connect-devices-wirelessly/index.jd @@ -1,9 +1,8 @@ page.title=Connecting Devices Wirelessly +page.tags="wifi","network","wireless" trainingnavtop=true startpage=true -next.title=Using Network Service Discovery -next.link=nsd.html @jd:body diff --git a/docs/html/training/displaying-bitmaps/cache-bitmap.jd b/docs/html/training/displaying-bitmaps/cache-bitmap.jd index 417ec5b..b1608c3 100644 --- a/docs/html/training/displaying-bitmaps/cache-bitmap.jd +++ b/docs/html/training/displaying-bitmaps/cache-bitmap.jd @@ -3,10 +3,6 @@ parent.title=Displaying Bitmaps Efficiently parent.link=index.html trainingnavtop=true -next.title=Displaying Bitmaps in Your UI -next.link=display-bitmap.html -previous.title=Processing Bitmaps Off the UI Thread -previous.link=process-bitmap.html @jd:body diff --git a/docs/html/training/displaying-bitmaps/display-bitmap.jd b/docs/html/training/displaying-bitmaps/display-bitmap.jd index 4572c42..ed1836c 100644 --- a/docs/html/training/displaying-bitmaps/display-bitmap.jd +++ b/docs/html/training/displaying-bitmaps/display-bitmap.jd @@ -3,8 +3,6 @@ parent.title=Displaying Bitmaps Efficiently parent.link=index.html trainingnavtop=true -previous.title=Caching Bitmaps -previous.link=cache-bitmap.html @jd:body diff --git a/docs/html/training/displaying-bitmaps/index.jd b/docs/html/training/displaying-bitmaps/index.jd index b91172b..857edee 100644 --- a/docs/html/training/displaying-bitmaps/index.jd +++ b/docs/html/training/displaying-bitmaps/index.jd @@ -1,9 +1,8 @@ page.title=Displaying Bitmaps Efficiently +page.tags="bitmaps","images","graphics" trainingnavtop=true startpage=true -next.title=Loading Large Bitmaps Efficiently -next.link=load-bitmap.html @jd:body @@ -26,7 +25,7 @@ next.link=load-bitmap.html </div> </div> -<p>This class covers some common techniques for processing and loading {@link +<p>Learn how to use common techniques to process and load {@link android.graphics.Bitmap} objects in a way that keeps your user interface (UI) components responsive and avoids exceeding your application memory limit. If you're not careful, bitmaps can quickly consume your available memory budget leading to an application crash due to the dreaded @@ -70,6 +69,9 @@ exception:<br />{@code java.lang.OutofMemoryError: bitmap size exceeds VM budget <dd>This lesson walks you through using a memory and disk bitmap cache to improve the responsiveness and fluidity of your UI when loading multiple bitmaps.</dd> + <dt><b><a href="manage-memory.html">Managing Bitmap Memory</a></b></dt> + <dd>This lesson explains how to manage bitmap memory to maximize your app's performance.</dd> + <dt><b><a href="display-bitmap.html">Displaying Bitmaps in Your UI</a></b></dt> <dd>This lesson brings everything together, showing you how to load multiple bitmaps into components like {@link android.support.v4.view.ViewPager} and {@link android.widget.GridView} diff --git a/docs/html/training/displaying-bitmaps/load-bitmap.jd b/docs/html/training/displaying-bitmaps/load-bitmap.jd index 283f272..633ffd2 100644 --- a/docs/html/training/displaying-bitmaps/load-bitmap.jd +++ b/docs/html/training/displaying-bitmaps/load-bitmap.jd @@ -3,8 +3,6 @@ parent.title=Displaying Bitmaps Efficiently parent.link=index.html trainingnavtop=true -next.title=Processing Bitmaps Off the UI Thread -next.link=process-bitmap.html @jd:body @@ -167,4 +165,4 @@ mImageView.setImageBitmap( <p>You can follow a similar process to decode bitmaps from other sources, by substituting the appropriate {@link android.graphics.BitmapFactory#decodeByteArray(byte[],int,int,android.graphics.BitmapFactory.Options) -BitmapFactory.decode*} method as needed.</p>
\ No newline at end of file +BitmapFactory.decode*} method as needed.</p> diff --git a/docs/html/training/displaying-bitmaps/manage-memory.jd b/docs/html/training/displaying-bitmaps/manage-memory.jd new file mode 100644 index 0000000..60ac2e6 --- /dev/null +++ b/docs/html/training/displaying-bitmaps/manage-memory.jd @@ -0,0 +1,297 @@ +page.title=Managing Bitmap Memory +parent.title=Displaying Bitmaps Efficiently +parent.link=index.html + +trainingnavtop=true + +@jd:body + +<div id="tb-wrapper"> +<div id="tb"> + +<h2>This lesson teaches you to</h2> +<ol> + <li><a href="#recycle">Manage Memory on Android 2.3.3 and Lower</a></li> + <li><a href="#inBitmap">Manage Memory on Android 3.0 and Higher</a></li> +</ol> + +<h2>You should also read</h2> +<ul> + <li><a href="http://android-developers.blogspot.com/2011/03/memory-analysis-for-android.html">Memory Analysis for Android Applications</a> blog post</li> + <li><a href="http://www.google.com/events/io/2011/sessions/memory-management-for-android-apps.html">Memory management for Android Apps</a> Google I/O presentation</li> + <li><a href="{@docRoot}design/patterns/swipe-views.html">Android Design: Swipe Views</a></li> + <li><a href="{@docRoot}design/building-blocks/grid-lists.html">Android Design: Grid Lists</a></li> +</ul> + +<h2>Try it out</h2> + +<div class="download-box"> + <a href="{@docRoot}shareables/training/BitmapFun.zip" class="button">Download the sample</a> + <p class="filename">BitmapFun.zip</p> +</div> + +</div> +</div> + +<p>In addition to the steps described in <a href="cache-bitmap.html">Caching Bitmaps</a>, +there are specific things you can do to facilitate garbage collection +and bitmap reuse. The recommended strategy depends on which version(s) +of Android you are targeting. The {@code BitmapFun} sample app included with +this class shows you how to design your app to work efficiently across +different versions of Android.</p> + +<p>To set the stage for this lesson, here is how Android's management of +bitmap memory has evolved:</p> +<ul> + <li> +On Android Android 2.2 (API level 8) and lower, when garbage +collection occurs, your app's threads get stopped. This causes a lag that +can degrade performance. +<strong>Android 2.3 adds concurrent garbage collection, which means that +the memory is reclaimed soon after a bitmap is no longer referenced.</strong> +</li> + + <li>On Android 2.3.3 (API level 10) and lower, the backing pixel data for a +bitmap is stored in native memory. It is separate from the bitmap itself, +which is stored in the Dalvik heap. The pixel data in native memory is +not released in a predictable manner, potentially causing an application +to briefly exceed its memory limits and crash. +<strong>As of Android 3.0 (API Level 11), the pixel data is stored on the +Dalvik heap along with the associated bitmap.</strong></li> + +</ul> + +<p>The following sections describe how to optimize bitmap memory +management for different Android versions.</p> + +<h2 id="recycle">Manage Memory on Android 2.3.3 and Lower</h2> + +<p>On Android 2.3.3 (API level 10) and lower, using +{@link android.graphics.Bitmap#recycle recycle()} +is recommended. If you're displaying large amounts of bitmap data in your app, +you're likely to run into +{@link java.lang.OutOfMemoryError} errors. The +{@link android.graphics.Bitmap#recycle recycle()} method allows an app +to reclaim memory as soon as possible.</p> + +<p class="note"><strong>Caution:</strong> You should use +{@link android.graphics.Bitmap#recycle recycle()} only when you are sure that the +bitmap is no longer being used. If you call {@link android.graphics.Bitmap#recycle recycle()} +and later attempt to draw the bitmap, you will get the error: +{@code "Canvas: trying to use a recycled bitmap"}.</p> + +<p>The following code snippet gives an example of calling +{@link android.graphics.Bitmap#recycle recycle()}. It uses reference counting +(in the variables {@code mDisplayRefCount} and {@code mCacheRefCount}) to track +whether a bitmap is currently being displayed or in the cache. The +code recycles the bitmap when these conditions are met:</p> + +<ul> +<li>The reference count for both {@code mDisplayRefCount} and +{@code mCacheRefCount} is 0.</li> +<li>The bitmap is not {@code null}, and it hasn't been recycled yet.</li> +</ul> + +<pre>private int mCacheRefCount = 0; +private int mDisplayRefCount = 0; +... +// Notify the drawable that the displayed state has changed. +// Keep a count to determine when the drawable is no longer displayed. +public void setIsDisplayed(boolean isDisplayed) { + synchronized (this) { + if (isDisplayed) { + mDisplayRefCount++; + mHasBeenDisplayed = true; + } else { + mDisplayRefCount--; + } + } + // Check to see if recycle() can be called. + checkState(); +} + +// Notify the drawable that the cache state has changed. +// Keep a count to determine when the drawable is no longer being cached. +public void setIsCached(boolean isCached) { + synchronized (this) { + if (isCached) { + mCacheRefCount++; + } else { + mCacheRefCount--; + } + } + // Check to see if recycle() can be called. + checkState(); +} + +private synchronized void checkState() { + // If the drawable cache and display ref counts = 0, and this drawable + // has been displayed, then recycle. + if (mCacheRefCount <= 0 && mDisplayRefCount <= 0 && mHasBeenDisplayed + && hasValidBitmap()) { + getBitmap().recycle(); + } +} + +private synchronized boolean hasValidBitmap() { + Bitmap bitmap = getBitmap(); + return bitmap != null && !bitmap.isRecycled(); +}</pre> + +<h2 id="inBitmap">Manage Memory on Android 3.0 and Higher</h2> + +<p>Android 3.0 (API Level 11) introduces the +{@link android.graphics.BitmapFactory.Options#inBitmap BitmapFactory.Options.inBitmap} +field. If this option is set, decode methods that take the +{@link android.graphics.BitmapFactory.Options Options} object +will attempt to reuse an existing bitmap when loading content. This means +that the bitmap's memory is reused, resulting in improved performance, and +removing both memory allocation and de-allocation. There are some caveats in using +{@link android.graphics.BitmapFactory.Options#inBitmap}:</p> +<ul> + <li>The reused bitmap must be of the same size as the source content (to make +sure that the same amount of memory is used), and in JPEG or PNG format +(whether as a resource or as a stream).</li> + + +<li>The {@link android.graphics.Bitmap.Config configuration} of the reused bitmap +overrides the setting of +{@link android.graphics.BitmapFactory.Options#inPreferredConfig}, if set. </li> + + <li>You should always use the returned bitmap of the decode method, +because you can't assume that reusing the bitmap worked (for example, if there is +a size mismatch).</li> + +<h3>Save a bitmap for later use</h3> + +<p>The following snippet demonstrates how an existing bitmap is stored for possible +later use in the sample app. When an app is running on Android 3.0 or higher and +a bitmap is evicted from the {@link android.util.LruCache}, +a soft reference to the bitmap is placed +in a {@link java.util.HashSet}, for possible reuse later with +{@link android.graphics.BitmapFactory.Options#inBitmap}: + +<pre>HashSet<SoftReference<Bitmap>> mReusableBitmaps; +private LruCache<String, BitmapDrawable> mMemoryCache; + +// If you're running on Honeycomb or newer, create +// a HashSet of references to reusable bitmaps. +if (Utils.hasHoneycomb()) { + mReusableBitmaps = new HashSet<SoftReference<Bitmap>>(); +} + +mMemoryCache = new LruCache<String, BitmapDrawable>(mCacheParams.memCacheSize) { + + // Notify the removed entry that is no longer being cached. + @Override + protected void entryRemoved(boolean evicted, String key, + BitmapDrawable oldValue, BitmapDrawable newValue) { + if (RecyclingBitmapDrawable.class.isInstance(oldValue)) { + // The removed entry is a recycling drawable, so notify it + // that it has been removed from the memory cache. + ((RecyclingBitmapDrawable) oldValue).setIsCached(false); + } else { + // The removed entry is a standard BitmapDrawable. + if (Utils.hasHoneycomb()) { + // We're running on Honeycomb or later, so add the bitmap + // to a SoftReference set for possible use with inBitmap later. + mReusableBitmaps.add + (new SoftReference<Bitmap>(oldValue.getBitmap())); + } + } + } +.... +}</pre> + + +<h3>Use an existing bitmap</h3> +<p>In the running app, decoder methods check to see if there is an existing +bitmap they can use. For example:</p> + +<pre>public static Bitmap decodeSampledBitmapFromFile(String filename, + int reqWidth, int reqHeight, ImageCache cache) { + + final BitmapFactory.Options options = new BitmapFactory.Options(); + ... + BitmapFactory.decodeFile(filename, options); + ... + + // If we're running on Honeycomb or newer, try to use inBitmap. + if (Utils.hasHoneycomb()) { + addInBitmapOptions(options, cache); + } + ... + return BitmapFactory.decodeFile(filename, options); +}</pre + +<p>The next snippet shows the {@code addInBitmapOptions()} method that is called in the +above snippet. It looks for an existing bitmap to set as the value for +{@link android.graphics.BitmapFactory.Options#inBitmap}. Note that this +method only sets a value for {@link android.graphics.BitmapFactory.Options#inBitmap} +if it finds a suitable match (your code should never assume that a match will be found):</p> + +<pre>private static void addInBitmapOptions(BitmapFactory.Options options, + ImageCache cache) { + // inBitmap only works with mutable bitmaps, so force the decoder to + // return mutable bitmaps. + options.inMutable = true; + + if (cache != null) { + // Try to find a bitmap to use for inBitmap. + Bitmap inBitmap = cache.getBitmapFromReusableSet(options); + + if (inBitmap != null) { + // If a suitable bitmap has been found, set it as the value of + // inBitmap. + options.inBitmap = inBitmap; + } + } +} + +// This method iterates through the reusable bitmaps, looking for one +// to use for inBitmap: +protected Bitmap getBitmapFromReusableSet(BitmapFactory.Options options) { + Bitmap bitmap = null; + + if (mReusableBitmaps != null && !mReusableBitmaps.isEmpty()) { + final Iterator<SoftReference<Bitmap>> iterator + = mReusableBitmaps.iterator(); + Bitmap item; + + while (iterator.hasNext()) { + item = iterator.next().get(); + + if (null != item && item.isMutable()) { + // Check to see it the item can be used for inBitmap. + if (canUseForInBitmap(item, options)) { + bitmap = item; + + // Remove from reusable set so it can't be used again. + iterator.remove(); + break; + } + } else { + // Remove from the set if the reference has been cleared. + iterator.remove(); + } + } + } + return bitmap; +}</pre> + +<p>Finally, this method determines whether a candidate bitmap +satisfies the size criteria to be used for +{@link android.graphics.BitmapFactory.Options#inBitmap}:</p> + +<pre>private static boolean canUseForInBitmap( + Bitmap candidate, BitmapFactory.Options targetOptions) { + int width = targetOptions.outWidth / targetOptions.inSampleSize; + int height = targetOptions.outHeight / targetOptions.inSampleSize; + + // Returns true if "candidate" can be used for inBitmap re-use with + // "targetOptions". + return candidate.getWidth() == width && candidate.getHeight() == height; +}</pre> + +</body> +</html> diff --git a/docs/html/training/displaying-bitmaps/process-bitmap.jd b/docs/html/training/displaying-bitmaps/process-bitmap.jd index d4fcff3..272b8bc 100644 --- a/docs/html/training/displaying-bitmaps/process-bitmap.jd +++ b/docs/html/training/displaying-bitmaps/process-bitmap.jd @@ -3,10 +3,6 @@ parent.title=Displaying Bitmaps Efficiently parent.link=index.html trainingnavtop=true -next.title=Caching Bitmaps -next.link=cache-bitmap.html -previous.title=Loading Large Bitmaps Efficiently -previous.link=load-bitmap.html @jd:body diff --git a/docs/html/training/efficient-downloads/index.jd b/docs/html/training/efficient-downloads/index.jd index a29be91..2ab93ae 100644 --- a/docs/html/training/efficient-downloads/index.jd +++ b/docs/html/training/efficient-downloads/index.jd @@ -1,9 +1,8 @@ page.title=Transferring Data Without Draining the Battery +page.tags="battery","network","wireless" trainingnavtop=true startpage=true -next.title=Optimizing Downloads for Efficient Network Access -next.link=efficient-network-access.html @jd:body diff --git a/docs/html/training/gestures/detector.jd b/docs/html/training/gestures/detector.jd index 06d0e98..65ddb1b 100644 --- a/docs/html/training/gestures/detector.jd +++ b/docs/html/training/gestures/detector.jd @@ -25,12 +25,18 @@ next.link=movement.html <li><a href="http://developer.android.com/guide/topics/ui/ui-events.html">Input Events</a> API Guide </li> <li><a href="{@docRoot}guide/topics/sensors/sensors_overview.html">Sensors Overview</a></li> - <li><a href="http://android-developers.blogspot.com/2010/06/making-sense-of-multitouch.html">Making Sense of Multitouch</a> blog post</li> <li><a href="{@docRoot}training/custom-views/making-interactive.html">Making the View Interactive</a> </li> <li>Design Guide for <a href="{@docRoot}design/patterns/gestures.html">Gestures</a></li> <li>Design Guide for <a href="{@docRoot}design/style/touch-feedback.html">Touch Feedback</a></li> </ul> +<h2>Try it out</h2> + +<div class="download-box"> + <a href="{@docRoot}shareables/training/InteractiveChart.zip" +class="button">Download the sample</a> + <p class="filename">InteractiveChart.zip</p> +</div> </div> </div> diff --git a/docs/html/training/gestures/index.jd b/docs/html/training/gestures/index.jd index 0191450..16ca7b0 100644 --- a/docs/html/training/gestures/index.jd +++ b/docs/html/training/gestures/index.jd @@ -20,12 +20,18 @@ next.link=detector.html <li><a href="http://developer.android.com/guide/topics/ui/ui-events.html">Input Events</a> API Guide </li> <li><a href="{@docRoot}guide/topics/sensors/sensors_overview.html">Sensors Overview</a></li> - <li><a href="http://android-developers.blogspot.com/2010/06/making-sense-of-multitouch.html">Making Sense of Multitouch</a> blog post</li> <li><a href="{@docRoot}training/custom-views/making-interactive.html">Making the View Interactive</a> </li> <li>Design Guide for <a href="{@docRoot}design/patterns/gestures.html">Gestures</a></li> <li>Design Guide for <a href="{@docRoot}design/style/touch-feedback.html">Touch Feedback</a></li> </ul> +<h2>Try it out</h2> + +<div class="download-box"> + <a href="{@docRoot}shareables/training/InteractiveChart.zip" +class="button">Download the sample</a> + <p class="filename">InteractiveChart.zip</p> +</div> </div> </div> diff --git a/docs/html/training/gestures/movement.jd b/docs/html/training/gestures/movement.jd index f2c49d7..fdc1ea4 100644 --- a/docs/html/training/gestures/movement.jd +++ b/docs/html/training/gestures/movement.jd @@ -24,12 +24,18 @@ next.link=scroll.html <li><a href="http://developer.android.com/guide/topics/ui/ui-events.html">Input Events</a> API Guide </li> <li><a href="{@docRoot}guide/topics/sensors/sensors_overview.html">Sensors Overview</a></li> - <li><a href="http://android-developers.blogspot.com/2010/06/making-sense-of-multitouch.html">Making Sense of Multitouch</a> blog post</li> <li><a href="{@docRoot}training/custom-views/making-interactive.html">Making the View Interactive</a> </li> <li>Design Guide for <a href="{@docRoot}design/patterns/gestures.html">Gestures</a></li> <li>Design Guide for <a href="{@docRoot}design/style/touch-feedback.html">Touch Feedback</a></li> </ul> +<h2>Try it out</h2> + +<div class="download-box"> + <a href="{@docRoot}shareables/training/InteractiveChart.zip" +class="button">Download the sample</a> + <p class="filename">InteractiveChart.zip</p> +</div> </div> </div> diff --git a/docs/html/training/gestures/multi.jd b/docs/html/training/gestures/multi.jd index d4c5b1d..6a0df11 100644 --- a/docs/html/training/gestures/multi.jd +++ b/docs/html/training/gestures/multi.jd @@ -25,12 +25,18 @@ next.link=scale.html <li><a href="http://developer.android.com/guide/topics/ui/ui-events.html">Input Events</a> API Guide </li> <li><a href="{@docRoot}guide/topics/sensors/sensors_overview.html">Sensors Overview</a></li> - <li><a href="http://android-developers.blogspot.com/2010/06/making-sense-of-multitouch.html">Making Sense of Multitouch</a> blog post</li> <li><a href="{@docRoot}training/custom-views/making-interactive.html">Making the View Interactive</a> </li> <li>Design Guide for <a href="{@docRoot}design/patterns/gestures.html">Gestures</a></li> <li>Design Guide for <a href="{@docRoot}design/style/touch-feedback.html">Touch Feedback</a></li> </ul> +<h2>Try it out</h2> + +<div class="download-box"> + <a href="{@docRoot}shareables/training/InteractiveChart.zip" +class="button">Download the sample</a> + <p class="filename">InteractiveChart.zip</p> +</div> </div> </div> diff --git a/docs/html/training/gestures/scale.jd b/docs/html/training/gestures/scale.jd index 17e4085..f2e4eb8 100644 --- a/docs/html/training/gestures/scale.jd +++ b/docs/html/training/gestures/scale.jd @@ -15,6 +15,7 @@ next.link=viewgroup.html <h2>This lesson teaches you to</h2> <ol> <li><a href="#drag">Drag an Object</a></li> + <li><a href="#pan">Drag to Pan</a></li> <li><a href="#scale">Use Touch to Perform Scaling</a></li> </ol> @@ -25,20 +26,25 @@ next.link=viewgroup.html <li><a href="http://developer.android.com/guide/topics/ui/ui-events.html">Input Events</a> API Guide </li> <li><a href="{@docRoot}guide/topics/sensors/sensors_overview.html">Sensors Overview</a></li> - <li><a href="http://android-developers.blogspot.com/2010/06/making-sense-of-multitouch.html">Making Sense of Multitouch</a> blog post</li> <li><a href="{@docRoot}training/custom-views/making-interactive.html">Making the View Interactive</a> </li> <li>Design Guide for <a href="{@docRoot}design/patterns/gestures.html">Gestures</a></li> <li>Design Guide for <a href="{@docRoot}design/style/touch-feedback.html">Touch Feedback</a></li> </ul> +<h2>Try it out</h2> + +<div class="download-box"> + <a href="{@docRoot}shareables/training/InteractiveChart.zip" +class="button">Download the sample</a> + <p class="filename">InteractiveChart.zip</p> +</div> </div> </div> + <p>This lesson describes how to use touch gestures to drag and scale on-screen objects, using {@link android.view.View#onTouchEvent onTouchEvent()} to intercept -touch events. Here is the original <a -href="http://code.google.com/p/android-touchexample/">source code</a> -for the examples used in this lesson. +touch events. </p> <h2 id="drag">Drag an Object</h2> @@ -128,17 +134,15 @@ public boolean onTouchEvent(MotionEvent ev) { final float x = MotionEventCompat.getX(ev, pointerIndex); final float y = MotionEventCompat.getY(ev, pointerIndex); - // Only move if the ScaleGestureDetector isn't processing a gesture. - if (!mScaleDetector.isInProgress()) { - // Calculate the distance moved - final float dx = x - mLastTouchX; - final float dy = y - mLastTouchY; + // Calculate the distance moved + final float dx = x - mLastTouchX; + final float dy = y - mLastTouchY; - mPosX += dx; - mPosY += dy; + mPosX += dx; + mPosY += dy; + + invalidate(); - invalidate(); - } // Remember this touch position for the next move event mLastTouchX = x; mLastTouchY = y; @@ -175,6 +179,88 @@ public boolean onTouchEvent(MotionEvent ev) { return true; }</pre> +<h2 id="pan">Drag to Pan</h2> + +<p>The previous section showed an example of dragging an object around the screen. Another +common scenario is <em>panning</em>, which is when a user's dragging motion causes scrolling +in both the x and y axes. The above snippet directly intercepted the {@link android.view.MotionEvent} +actions to implement dragging. The snippet in this section takes advantage of the platform's +built-in support for common gestures. It overrides +{@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()} in +{@link android.view.GestureDetector.SimpleOnGestureListener}.</p> + +<p>To provide a little more context, {@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()} +is called when a user is dragging his finger to pan the content. +{@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()} is only called when +a finger is down; as soon as the finger is lifted from the screen, the gesture either ends, +or a fling gesture is started (if the finger was moving with some speed just before it was lifted). +For more discussion of scrolling vs. flinging, see <a href="scroll.html">Animating a Scroll Gesture</a>.</p> + +<p>Here is the snippet for {@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()}: + + +<pre>// The current viewport. This rectangle represents the currently visible +// chart domain and range. +private RectF mCurrentViewport = + new RectF(AXIS_X_MIN, AXIS_Y_MIN, AXIS_X_MAX, AXIS_Y_MAX); + +// The current destination rectangle (in pixel coordinates) into which the +// chart data should be drawn. +private Rect mContentRect; + +private final GestureDetector.SimpleOnGestureListener mGestureListener + = new GestureDetector.SimpleOnGestureListener() { +... + +@Override +public boolean onScroll(MotionEvent e1, MotionEvent e2, + float distanceX, float distanceY) { + // Scrolling uses math based on the viewport (as opposed to math using pixels). + + // Pixel offset is the offset in screen pixels, while viewport offset is the + // offset within the current viewport. + float viewportOffsetX = distanceX * mCurrentViewport.width() + / mContentRect.width(); + float viewportOffsetY = -distanceY * mCurrentViewport.height() + / mContentRect.height(); + ... + // Updates the viewport, refreshes the display. + setViewportBottomLeft( + mCurrentViewport.left + viewportOffsetX, + mCurrentViewport.bottom + viewportOffsetY); + ... + return true; +}</pre> + +<p>The implementation of {@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()} +scrolls the viewport in response to the touch gesture:</p> + +<pre> +/** + * Sets the current viewport (defined by mCurrentViewport) to the given + * X and Y positions. Note that the Y value represents the topmost pixel position, + * and thus the bottom of the mCurrentViewport rectangle. + */ +private void setViewportBottomLeft(float x, float y) { + /* + * Constrains within the scroll range. The scroll range is simply the viewport + * extremes (AXIS_X_MAX, etc.) minus the viewport size. For example, if the + * extremes were 0 and 10, and the viewport size was 2, the scroll range would + * be 0 to 8. + */ + + float curWidth = mCurrentViewport.width(); + float curHeight = mCurrentViewport.height(); + x = Math.max(AXIS_X_MIN, Math.min(x, AXIS_X_MAX - curWidth)); + y = Math.max(AXIS_Y_MIN + curHeight, Math.min(y, AXIS_Y_MAX)); + + mCurrentViewport.set(x, y - curHeight, x + curWidth, y); + + // Invalidates the View to update the display. + ViewCompat.postInvalidateOnAnimation(this); +} +</pre> + <h2 id="scale">Use Touch to Perform Scaling</h2> <p>As discussed in <a href="detector.html">Detecting Common Gestures</a>, @@ -191,10 +277,10 @@ Android provides {@link android.view.ScaleGestureDetector.SimpleOnScaleGestureListener} as a helper class that you can extend if you don’t care about all of the reported events.</p> -<p>Here is a snippet that gives you the basic idea of how to perform scaling. -Here is the original <a -href="http://code.google.com/p/android-touchexample/">source code</a> -for the examples.</p> + +<h3>Basic scaling example</h3> + +<p>Here is a snippet that illustrates the basic ingredients involved in scaling.</p> <pre>private ScaleGestureDetector mScaleDetector; private float mScaleFactor = 1.f; @@ -238,3 +324,88 @@ private class ScaleListener return true; } }</pre> + + + + +<h3>More complex scaling example</h3> +<p>Here is a more complex example from the {@code InteractiveChart} sample provided with this class. +The {@code InteractiveChart} sample supports both scrolling (panning) and scaling with multiple fingers, +using the {@link android.view.ScaleGestureDetector} "span" +({@link android.view.ScaleGestureDetector#getCurrentSpanX getCurrentSpanX/Y}) and +"focus" ({@link android.view.ScaleGestureDetector#getFocusX getFocusX/Y}) features:</p> + +<pre>@Override +private RectF mCurrentViewport = + new RectF(AXIS_X_MIN, AXIS_Y_MIN, AXIS_X_MAX, AXIS_Y_MAX); +private Rect mContentRect; +private ScaleGestureDetector mScaleGestureDetector; +... +public boolean onTouchEvent(MotionEvent event) { + boolean retVal = mScaleGestureDetector.onTouchEvent(event); + retVal = mGestureDetector.onTouchEvent(event) || retVal; + return retVal || super.onTouchEvent(event); +} + +/** + * The scale listener, used for handling multi-finger scale gestures. + */ +private final ScaleGestureDetector.OnScaleGestureListener mScaleGestureListener + = new ScaleGestureDetector.SimpleOnScaleGestureListener() { + /** + * This is the active focal point in terms of the viewport. Could be a local + * variable but kept here to minimize per-frame allocations. + */ + private PointF viewportFocus = new PointF(); + private float lastSpanX; + private float lastSpanY; + + // Detects that new pointers are going down. + @Override + public boolean onScaleBegin(ScaleGestureDetector scaleGestureDetector) { + lastSpanX = ScaleGestureDetectorCompat. + getCurrentSpanX(scaleGestureDetector); + lastSpanY = ScaleGestureDetectorCompat. + getCurrentSpanY(scaleGestureDetector); + return true; + } + + @Override + public boolean onScale(ScaleGestureDetector scaleGestureDetector) { + + float spanX = ScaleGestureDetectorCompat. + getCurrentSpanX(scaleGestureDetector); + float spanY = ScaleGestureDetectorCompat. + getCurrentSpanY(scaleGestureDetector); + + float newWidth = lastSpanX / spanX * mCurrentViewport.width(); + float newHeight = lastSpanY / spanY * mCurrentViewport.height(); + + float focusX = scaleGestureDetector.getFocusX(); + float focusY = scaleGestureDetector.getFocusY(); + // Makes sure that the chart point is within the chart region. + // See the sample for the implementation of hitTest(). + hitTest(scaleGestureDetector.getFocusX(), + scaleGestureDetector.getFocusY(), + viewportFocus); + + mCurrentViewport.set( + viewportFocus.x + - newWidth * (focusX - mContentRect.left) + / mContentRect.width(), + viewportFocus.y + - newHeight * (mContentRect.bottom - focusY) + / mContentRect.height(), + 0, + 0); + mCurrentViewport.right = mCurrentViewport.left + newWidth; + mCurrentViewport.bottom = mCurrentViewport.top + newHeight; + ... + // Invalidates the View to update the display. + ViewCompat.postInvalidateOnAnimation(InteractiveLineGraphView.this); + + lastSpanX = spanX; + lastSpanY = spanY; + return true; + } +};</pre> diff --git a/docs/html/training/gestures/scroll.jd b/docs/html/training/gestures/scroll.jd index 8576948..bd1537a 100644 --- a/docs/html/training/gestures/scroll.jd +++ b/docs/html/training/gestures/scroll.jd @@ -14,6 +14,7 @@ next.link=multi.html <!-- table of contents --> <h2>This lesson teaches you to</h2> <ol> + <li><a href="#term">Understand Scrolling Terminology</a></li> <li><a href="#scroll">Implement Touch-Based Scrolling</a></li> </ol> @@ -24,12 +25,18 @@ next.link=multi.html <li><a href="http://developer.android.com/guide/topics/ui/ui-events.html">Input Events</a> API Guide </li> <li><a href="{@docRoot}guide/topics/sensors/sensors_overview.html">Sensors Overview</a></li> - <li><a href="http://android-developers.blogspot.com/2010/06/making-sense-of-multitouch.html">Making Sense of Multitouch</a> blog post</li> <li><a href="{@docRoot}training/custom-views/making-interactive.html">Making the View Interactive</a> </li> <li>Design Guide for <a href="{@docRoot}design/patterns/gestures.html">Gestures</a></li> <li>Design Guide for <a href="{@docRoot}design/style/touch-feedback.html">Touch Feedback</a></li> </ul> +<h2>Try it out</h2> + +<div class="download-box"> + <a href="{@docRoot}shareables/training/InteractiveChart.zip" +class="button">Download the sample</a> + <p class="filename">InteractiveChart.zip</p> +</div> </div> </div> @@ -45,7 +52,26 @@ a scrolling effect in response to touch gestures using <em>scrollers</em>. <p>You can use scrollers ({@link android.widget.Scroller} or {@link android.widget.OverScroller}) to collect the data you need to produce a -scrolling animation in response to a touch event.</p> +scrolling animation in response to a touch event. They are similar, but +{@link android.widget.OverScroller} +includes methods for indicating to users that they've reached the content edges +after a pan or fling gesture. The {@code InteractiveChart} sample +uses the the {@link android.widget.EdgeEffect} class +(actually the {@link android.support.v4.widget.EdgeEffectCompat} class) +to display a "glow" effect when users reach the content edges.</p> + +<p class="note"><strong>Note:</strong> We recommend that you +use {@link android.widget.OverScroller} rather than {@link +android.widget.Scroller} for scrolling animations. +{@link android.widget.OverScroller} provides the best backward +compatibility with older devices. +<br /> +Also note that you generally only need to use scrollers +when implementing scrolling yourself. {@link android.widget.ScrollView} and +{@link android.widget.HorizontalScrollView} do all of this for you if you nest your +layout within them. +</p> + <p>A scroller is used to animate scrolling over time, using platform-standard scrolling physics (friction, velocity, etc.). The scroller itself doesn't @@ -54,101 +80,280 @@ they don't automatically apply those positions to your view. It's your responsibility to get and apply new coordinates at a rate that will make the scrolling animation look smooth.</p> -<p class="note"><strong>Note:</strong> You generally only need to use scrollers -when implementing scrolling yourself. {@link android.widget.ScrollView} and -{@link android.widget.HorizontalScrollView} do all this for you do all of this for you if you nest your layout within them.</p> -<h2 id = "scroll">Implement Touch-Based Scrolling</h2> +<h2 id="term">Understand Scrolling Terminology</h2> -<p>This snippet illustrates the basics of using a scroller. It uses a -{@link android.view.GestureDetector}, and overrides the -{@link android.view.GestureDetector.SimpleOnGestureListener} methods -{@link android.view.GestureDetector.OnGestureListener#onDown onDown()} and -{@link android.view.GestureDetector.OnGestureListener#onFling onFling()}. It also -overrides {@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()} -to return {@code false} since you don't need to animate a scroll.</p> +<p>"Scrolling" is a word that can take on different meanings in Android, depending on the context.</p> + +<p><strong>Scrolling</strong> is the general process of moving the viewport (that is, the 'window' +of content you're looking at). When scrolling is in both the x and y axes, it's called +<em>panning</em>. The sample application provided with this class, {@code InteractiveChart}, illustrates +two different types of scrolling, dragging and flinging:</p> +<ul> + <li><strong>Dragging</strong> is the type of scrolling that occurs when a user drags her +finger across the touch screen. Simple dragging is often implemented by overriding +{@link android.view.GestureDetector.OnGestureListener#onScroll onScroll()} in +{@link android.view.GestureDetector.OnGestureListener}. For more discussion of dragging, see +<a href="dragging.jd">Dragging and Scaling</a>.</li> + <li><strong>Flinging</strong> is the type of scrolling that occurs when a user +drags and lifts her finger quickly. After the user lifts her finger, you generally +want to keep scrolling (moving the viewport), but decelerate until the viewport stops moving. +Flinging can be implemented by overriding +{@link android.view.GestureDetector.OnGestureListener#onFling onFling()} +in {@link android.view.GestureDetector.OnGestureListener}, and by using +a scroller object. This is the use +case that is the topic of this lesson.</li> +</ul> -<p>It's common to use scrollers in conjunction with a fling gesture, but they +<p>It's common to use scroller objects +in conjunction with a fling gesture, but they can be used in pretty much any context where you want the UI to display -scrolling in response to a touch event. For example, you could override {@link -android.view.View#onTouchEvent onTouchEvent()} to process touch events directly, -and produce a scrolling effect in response to those touch events.</p> +scrolling in response to a touch event. For example, you could override +{@link android.view.View#onTouchEvent onTouchEvent()} to process touch +events directly, and produce a scrolling effect or a "snapping to page" animation +in response to those touch events.</p> + + +<h2 id="#scroll">Implement Touch-Based Scrolling</h2> + +<p>This section describes how to use a scroller. +The snippet shown below comes from the {@code InteractiveChart} sample +provided with this class. +It uses a +{@link android.view.GestureDetector}, and overrides the +{@link android.view.GestureDetector.SimpleOnGestureListener} method +{@link android.view.GestureDetector.OnGestureListener#onFling onFling()}. +It uses {@link android.widget.OverScroller} to track the fling gesture. +If the user reaches the content edges +after the fling gesture, the app displays a "glow" effect. +</p> -<pre> -private OverScroller mScroller = new OverScroller(context); +<p class="note"><strong>Note:</strong> The {@code InteractiveChart} sample app displays a +chart that you can zoom, pan, scroll, and so on. In the following snippet, +{@code mContentRect} represents the rectangle coordinates within the view that the chart +will be drawn into. At any given time, a subset of the total chart domain and range are drawn +into this rectangular area. +{@code mCurrentViewport} represents the portion of the chart that is currently +visible in the screen. Because pixel offsets are generally treated as integers, +{@code mContentRect} is of the type {@link android.graphics.Rect}. Because the +graph domain and range are decimal/float values, {@code mCurrentViewport} is of +the type {@link android.graphics.RectF}.</p> -private GestureDetector.SimpleOnGestureListener mGestureListener +<p>The first part of the snippet shows the implementation of +{@link android.view.GestureDetector.OnGestureListener#onFling onFling()}:</p> + +<pre>// The current viewport. This rectangle represents the currently visible +// chart domain and range. The viewport is the part of the app that the +// user manipulates via touch gestures. +private RectF mCurrentViewport = + new RectF(AXIS_X_MIN, AXIS_Y_MIN, AXIS_X_MAX, AXIS_Y_MAX); + +// The current destination rectangle (in pixel coordinates) into which the +// chart data should be drawn. +private Rect mContentRect; + +private OverScroller mScroller; +private RectF mScrollerStartViewport; +... +private final GestureDetector.SimpleOnGestureListener mGestureListener = new GestureDetector.SimpleOnGestureListener() { @Override public boolean onDown(MotionEvent e) { - // Abort any active scroll animations and invalidate. + // Initiates the decay phase of any active edge effects. + releaseEdgeEffects(); + mScrollerStartViewport.set(mCurrentViewport); + // Aborts any active scroll animations and invalidates. mScroller.forceFinished(true); - // There is also a compatibility version: - // ViewCompat.postInvalidateOnAnimation - postInvalidateOnAnimation(); + ViewCompat.postInvalidateOnAnimation(InteractiveLineGraphView.this); return true; } - - @Override - public boolean onScroll(MotionEvent e1, MotionEvent e2, - float distanceX, float distanceY) { - // You don't use a scroller in onScroll because you don't need to animate - // a scroll. The scroll occurs instantly in response to touch feedback. - return false; - } - + ... @Override public boolean onFling(MotionEvent e1, MotionEvent e2, float velocityX, float velocityY) { - // Before flinging, abort the current animation. - mScroller.forceFinished(true); - // Begin the scroll animation - mScroller.fling( - // Current scroll position - startX, - startY, - // Velocities, negated for natural touch response - (int) -velocityX, - (int) -velocityY, - // Minimum and maximum scroll positions. The minimum scroll - // position is generally zero and the maximum scroll position - // is generally the content size less the screen size. So if the - // content width is 1000 pixels and the screen width is 200 - // pixels, the maximum scroll offset should be 800 pixels. - minX, maxX, - minY, maxY, - // The maximum overscroll bounds. This is useful when using - // the EdgeEffect class to draw overscroll "glow" overlays. - mContentRect.width() / 2, - mContentRect.height() / 2); - // Invalidate to trigger computeScroll() - postInvalidateOnAnimation(); + fling((int) -velocityX, (int) -velocityY); return true; } }; +private void fling(int velocityX, int velocityY) { + // Initiates the decay phase of any active edge effects. + releaseEdgeEffects(); + // Flings use math in pixels (as opposed to math based on the viewport). + Point surfaceSize = computeScrollSurfaceSize(); + mScrollerStartViewport.set(mCurrentViewport); + int startX = (int) (surfaceSize.x * (mScrollerStartViewport.left - + AXIS_X_MIN) / ( + AXIS_X_MAX - AXIS_X_MIN)); + int startY = (int) (surfaceSize.y * (AXIS_Y_MAX - + mScrollerStartViewport.bottom) / ( + AXIS_Y_MAX - AXIS_Y_MIN)); + // Before flinging, aborts the current animation. + mScroller.forceFinished(true); + // Begins the animation + mScroller.fling( + // Current scroll position + startX, + startY, + velocityX, + velocityY, + /* + * Minimum and maximum scroll positions. The minimum scroll + * position is generally zero and the maximum scroll position + * is generally the content size less the screen size. So if the + * content width is 1000 pixels and the screen width is 200 + * pixels, the maximum scroll offset should be 800 pixels. + */ + 0, surfaceSize.x - mContentRect.width(), + 0, surfaceSize.y - mContentRect.height(), + // The edges of the content. This comes into play when using + // the EdgeEffect class to draw "glow" overlays. + mContentRect.width() / 2, + mContentRect.height() / 2); + // Invalidates to trigger computeScroll() + ViewCompat.postInvalidateOnAnimation(this); +}</pre> + +<p>When {@link android.view.GestureDetector.OnGestureListener#onFling onFling()} calls +{@link android.support.v4.view.ViewCompat#postInvalidateOnAnimation postInvalidateOnAnimation()}, +it triggers +{@link android.view.View#computeScroll computeScroll()} to update the values for x and y. +This is typically be done when a view child is animating a scroll using a scroller object, as in this example. </p> + +<p>Most views pass the scroller object's x and y position directly to +{@link android.view.View#scrollTo scrollTo()}. +The following implementation of {@link android.view.View#computeScroll computeScroll()} +takes a different approach—it calls +{@link android.widget.OverScroller#computeScrollOffset computeScrollOffset()} to get the current +location of x and y. When the criteria for displaying an overscroll "glow" edge effect are met +(the display is zoomed in, x or y is out of bounds, and the app isn't already showing an overscroll), +the code sets up the overscroll glow effect and calls +{@link android.support.v4.view.ViewCompat#postInvalidateOnAnimation postInvalidateOnAnimation()} +to trigger an invalidate on the view:</p> + +<pre>// Edge effect / overscroll tracking objects. +private EdgeEffectCompat mEdgeEffectTop; +private EdgeEffectCompat mEdgeEffectBottom; +private EdgeEffectCompat mEdgeEffectLeft; +private EdgeEffectCompat mEdgeEffectRight; + +private boolean mEdgeEffectTopActive; +private boolean mEdgeEffectBottomActive; +private boolean mEdgeEffectLeftActive; +private boolean mEdgeEffectRightActive; + @Override public void computeScroll() { super.computeScroll(); - // Compute the current scroll offsets. If this returns true, then the - // scroll has not yet finished. + boolean needsInvalidate = false; + + // The scroller isn't finished, meaning a fling or programmatic pan + // operation is currently active. if (mScroller.computeScrollOffset()) { + Point surfaceSize = computeScrollSurfaceSize(); int currX = mScroller.getCurrX(); int currY = mScroller.getCurrY(); - // Actually render the scrolled viewport, or actually scroll the - // view using View.scrollTo. + boolean canScrollX = (mCurrentViewport.left > AXIS_X_MIN + || mCurrentViewport.right < AXIS_X_MAX); + boolean canScrollY = (mCurrentViewport.top > AXIS_Y_MIN + || mCurrentViewport.bottom < AXIS_Y_MAX); - // If currX or currY are outside the bounds, render the overscroll - // glow using EdgeEffect. + /* + * If you are zoomed in and currX or currY is + * outside of bounds and you're not already + * showing overscroll, then render the overscroll + * glow edge effect. + */ + if (canScrollX + && currX < 0 + && mEdgeEffectLeft.isFinished() + && !mEdgeEffectLeftActive) { + mEdgeEffectLeft.onAbsorb((int) + OverScrollerCompat.getCurrVelocity(mScroller)); + mEdgeEffectLeftActive = true; + needsInvalidate = true; + } else if (canScrollX + && currX > (surfaceSize.x - mContentRect.width()) + && mEdgeEffectRight.isFinished() + && !mEdgeEffectRightActive) { + mEdgeEffectRight.onAbsorb((int) + OverScrollerCompat.getCurrVelocity(mScroller)); + mEdgeEffectRightActive = true; + needsInvalidate = true; + } - } else { - // The scroll has finished. - } + if (canScrollY + && currY < 0 + && mEdgeEffectTop.isFinished() + && !mEdgeEffectTopActive) { + mEdgeEffectTop.onAbsorb((int) + OverScrollerCompat.getCurrVelocity(mScroller)); + mEdgeEffectTopActive = true; + needsInvalidate = true; + } else if (canScrollY + && currY > (surfaceSize.y - mContentRect.height()) + && mEdgeEffectBottom.isFinished() + && !mEdgeEffectBottomActive) { + mEdgeEffectBottom.onAbsorb((int) + OverScrollerCompat.getCurrVelocity(mScroller)); + mEdgeEffectBottomActive = true; + needsInvalidate = true; + } + ... + }</pre> + +<p>Here is the section of the code that performs the actual zoom:</p> + +<pre>// Custom object that is functionally similar to Scroller +Zoomer mZoomer; +private PointF mZoomFocalPoint = new PointF(); +... + +// If a zoom is in progress (either programmatically or via double +// touch), performs the zoom. +if (mZoomer.computeZoom()) { + float newWidth = (1f - mZoomer.getCurrZoom()) * + mScrollerStartViewport.width(); + float newHeight = (1f - mZoomer.getCurrZoom()) * + mScrollerStartViewport.height(); + float pointWithinViewportX = (mZoomFocalPoint.x - + mScrollerStartViewport.left) + / mScrollerStartViewport.width(); + float pointWithinViewportY = (mZoomFocalPoint.y - + mScrollerStartViewport.top) + / mScrollerStartViewport.height(); + mCurrentViewport.set( + mZoomFocalPoint.x - newWidth * pointWithinViewportX, + mZoomFocalPoint.y - newHeight * pointWithinViewportY, + mZoomFocalPoint.x + newWidth * (1 - pointWithinViewportX), + mZoomFocalPoint.y + newHeight * (1 - pointWithinViewportY)); + constrainViewport(); + needsInvalidate = true; +} +if (needsInvalidate) { + ViewCompat.postInvalidateOnAnimation(this); +} +</pre> + +<p>This is the {@code computeScrollSurfaceSize()} method that's called in the above snippet. It +computes the current scrollable surface size, in pixels. For example, if the entire chart area is visible, +this is simply the current size of {@code mContentRect}. If the chart is zoomed in 200% in both directions, +the returned size will be twice as large horizontally and vertically.</p> + +<pre>private Point computeScrollSurfaceSize() { + return new Point( + (int) (mContentRect.width() * (AXIS_X_MAX - AXIS_X_MIN) + / mCurrentViewport.width()), + (int) (mContentRect.height() * (AXIS_Y_MAX - AXIS_Y_MIN) + / mCurrentViewport.height())); }</pre> -<p>For another example of scroller usage, see the <a href="http://github.com/android/platform_frameworks_support/blob/master/v4/java/android/support/v4/view/ViewPager.java">source code</a> for the -{@link android.support.v4.view.ViewPager} class.</p> +<p>For another example of scroller usage, see the +<a href="http://github.com/android/platform_frameworks_support/blob/master/v4/java/android/support/v4/view/ViewPager.java">source code</a> for the +{@link android.support.v4.view.ViewPager} class. It scrolls in response to flings, +and uses scrolling to implement the "snapping to page" animation.</p> + diff --git a/docs/html/training/gestures/viewgroup.jd b/docs/html/training/gestures/viewgroup.jd index 257a5d8..5b32300 100644 --- a/docs/html/training/gestures/viewgroup.jd +++ b/docs/html/training/gestures/viewgroup.jd @@ -26,12 +26,19 @@ next.link= <li><a href="http://developer.android.com/guide/topics/ui/ui-events.html">Input Events</a> API Guide </li> <li><a href="{@docRoot}guide/topics/sensors/sensors_overview.html">Sensors Overview</a></li> - <li><a href="http://android-developers.blogspot.com/2010/06/making-sense-of-multitouch.html">Making Sense of Multitouch</a> blog post</li> <li><a href="{@docRoot}training/custom-views/making-interactive.html">Making the View Interactive</a> </li> <li>Design Guide for <a href="{@docRoot}design/patterns/gestures.html">Gestures</a></li> <li>Design Guide for <a href="{@docRoot}design/style/touch-feedback.html">Touch Feedback</a></li> </ul> +<h2>Try it out</h2> + +<div class="download-box"> + <a href="{@docRoot}shareables/training/InteractiveChart.zip" +class="button">Download the sample</a> + <p class="filename">InteractiveChart.zip</p> +</div> + </div> </div> diff --git a/docs/html/training/graphics/opengl/index.jd b/docs/html/training/graphics/opengl/index.jd index 23a734a..cf33d80 100644 --- a/docs/html/training/graphics/opengl/index.jd +++ b/docs/html/training/graphics/opengl/index.jd @@ -1,7 +1,6 @@ page.title=Displaying Graphics with OpenGL ES +page=tags="open gl","graphics" trainingnavtop=true -next.title=Building an OpenGL ES Environment -next.link=environment.html @jd:body diff --git a/docs/html/training/id-auth/authenticate.jd b/docs/html/training/id-auth/authenticate.jd index c316af7..3084bea 100644 --- a/docs/html/training/id-auth/authenticate.jd +++ b/docs/html/training/id-auth/authenticate.jd @@ -114,7 +114,7 @@ am.getAuthToken( new Handler(new OnError())); // Callback called if an error occurs </pre> -<p>In this example, <code>OnTokenAcquired</code> is a class that extends +<p>In this example, <code>OnTokenAcquired</code> is a class that implements {@link android.accounts.AccountManagerCallback}. {@link android.accounts.AccountManager} calls {@link android.accounts.AccountManagerCallback#run run()} on <code>OnTokenAcquired</code> with an {@link android.accounts.AccountManagerFuture} that contains a {@link android.os.Bundle}. If diff --git a/docs/html/training/implementing-navigation/lateral.jd b/docs/html/training/implementing-navigation/lateral.jd index b59bab2..c8f57a2 100644 --- a/docs/html/training/implementing-navigation/lateral.jd +++ b/docs/html/training/implementing-navigation/lateral.jd @@ -43,7 +43,8 @@ next.link=ancestral.html <p>Tabs allow the user to navigate between sibling screens by selecting the appropriate tab indicator available at the top of the display. In Android 3.0 and later, tabs are implemented using the {@link android.app.ActionBar} class, and are generally set up in {@link android.app.Activity#onCreate Activity.onCreate()}. In some cases, such as when horizontal space is limited and/or the number of tabs is large, an appropriate alternate presentation for tabs is a dropdown list (sometimes implemented using a {@link android.widget.Spinner}).</p> -<p>In previous versions of Android, tabs could be implemented using a {@link android.widget.TabWidget} and {@link android.widget.TabHost}. For details, see the <a href="{@docRoot}resources/tutorials/views/hello-tabwidget.html">Hello, Views</a> tutorial.</p> +<p>In previous versions of Android, tabs could be implemented using a +{@link android.widget.TabWidget} and {@link android.widget.TabHost}.</p> <p>As of Android 3.0, however, you should use either {@link android.app.ActionBar#NAVIGATION_MODE_TABS} or {@link android.app.ActionBar#NAVIGATION_MODE_LIST} along with the {@link android.app.ActionBar} class.</p> @@ -131,6 +132,9 @@ public class CollectionDemoActivity extends FragmentActivity { ViewPager mViewPager; public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_collection_demo); + // ViewPager and its adapters use support library // fragments, so use getSupportFragmentManager. mDemoCollectionPagerAdapter = diff --git a/docs/html/training/in-app-billing/preparing-iab-app.jd b/docs/html/training/in-app-billing/preparing-iab-app.jd index ab33ccc..de2dac5 100644 --- a/docs/html/training/in-app-billing/preparing-iab-app.jd +++ b/docs/html/training/in-app-billing/preparing-iab-app.jd @@ -33,15 +33,15 @@ next.link=list-iab-products.html <p>Before you can start using the In-app Billing service, you'll need to add the library that contains the In-app Billing Version 3 API to your Android project. You also need to setting the permissions for your application to communicate with Google Play. In addition, you'll need to establish a connection between your application and Google Play. You should also verify that the In-app Billing API version that you are using in your application is supported by Google Play.</p> <h2 id="GetSample">Download the Sample Application</h2> -<p>In this training class, you will use a reference implementation for the In-app Billing Version 3 API called the {@code TrivialDrive} sample application. The sample includes convenience classes to quickly set up the In-app Billing service, marshal and unmarshal data types, and handle In-app Billing requests from the main thread of your application. </p> +<p>In this training class, you will use a reference implementation for the In-app Billing Version 3 API called the {@code TrivialDrive} sample application. The sample includes convenience classes to quickly set up the In-app Billing service, marshal and unmarshal data types, and handle In-app Billing requests from the main thread of your application.</p> <p>To download the sample application:</p> <ol> <li>Open the <a href="{@docRoot}tools/help/sdk-manager.html">Android SDK Manager</a>.</li> <li>In the SDK Manager, expand the {@code Extras} section.</li> -<li>Select <strong>Google Play Billing Library</strong>. Make sure to select the download for In-app Billing Version 3 or above.</li> -<li>Click <strong>Install</strong> to complete the download.</li> +<li>Select <strong>Google Play Billing Library</strong>.</li> +<li>Click <strong>Install packages</strong> to complete the download.</li> </ol> -<p>The sample files will be installed to {@code /your/sdk/location/extras/google/play_billing/in-app-billing-v03}.</p> +<p>The sample files will be installed to {@code <sdk>/extras/google/play_billing/}.</p> <h2 id="AddToDevConsole">Add Your Application to the Developer Console</h2> <p>The Google Play Developer Console is where you publish your In-app Billing application and manage the various digital goods that are available for purchase from your application. When you create a new application entry in the Developer Console, it automatically generates a public license key for your application. You will need this key to establish a trusted connection from your application to the Google Play servers. You only need to generate this key once per application, and don’t need to repeat these steps when you update the APK file for your application.</p> @@ -133,6 +133,7 @@ mHelper.startSetup(new IabHelper.OnIabSetupFinishedListener() { <pre> @Override public void onDestroy() { + super.onDestroy(); if (mHelper != null) mHelper.dispose(); mHelper = null; } diff --git a/docs/html/training/in-app-billing/purchase-iab-products.jd b/docs/html/training/in-app-billing/purchase-iab-products.jd index 7fa77d3..4e6e035 100644 --- a/docs/html/training/in-app-billing/purchase-iab-products.jd +++ b/docs/html/training/in-app-billing/purchase-iab-products.jd @@ -104,7 +104,7 @@ IabHelper.QueryInventoryFinishedListener mGotInventoryListener </pre> <h2 id="Consume">Consume a Purchase</h2> -<p>You can use the In-app Billing Version 3 API to track the ownership of purchased items in Google Play. Once an item is purchased, it is considered to be "owned" and cannot be purchased again from Google Play while in that state. You must send a consumption request for the item before Google Play makes it available for purchase again. All managed in-app products are consumable. How you use the consumption mechanism in your app is up to you. Typically, you would implement consumption for products with temporary benefits that users may want to purchase multiple times (for example, in-game currency or replensihable game tokens). You would typically not want to implement consumption for products that are purchased once and provide a permanent effect (for example, a premium upgrade).</p> +<p>You can use the In-app Billing Version 3 API to track the ownership of purchased items in Google Play. Once an item is purchased, it is considered to be "owned" and cannot be purchased again from Google Play while in that state. You must send a consumption request for the item before Google Play makes it available for purchase again. All managed in-app products are consumable. How you use the consumption mechanism in your app is up to you. Typically, you would implement consumption for products with temporary benefits that users may want to purchase multiple times (for example, in-game currency or replenishable game tokens). You would typically not want to implement consumption for products that are purchased once and provide a permanent effect (for example, a premium upgrade).</p> <p>It's your responsibility to control and track how the in-app product is provisioned to the user. For example, if the user purchased in-game currency, you should update the player's inventory with the amount of currency purchased.</p> <p class="note"><strong>Security Recommendation:</strong> You must send a consumption request before provisioning the benefit of the consumable in-app purchase to the user. Make sure that you have received a successful consumption response from Google Play before you provision the item.</p> <p>To record a purchase consumption, call {@code consumeAsync(Purchase, OnConsumeFinishedListener)} on your {@code IabHelper} instance. The first argument that the method takes is the {@code Purchase} object representing the item to consume. The second argument is a {@code OnConsumeFinishedListener} that is notified when the consumption operation has completed and handles the consumption response from Google Play. It is safe to make this call fom your main thread.</p> diff --git a/docs/html/training/managing-audio/index.jd b/docs/html/training/managing-audio/index.jd index 0f7bbfd..3e3bcf0 100644 --- a/docs/html/training/managing-audio/index.jd +++ b/docs/html/training/managing-audio/index.jd @@ -1,9 +1,8 @@ page.title=Managing Audio Playback +page.tags="audio","media" trainingnavtop=true startpage=true -next.title=Controlling Your App's Volume and Playback -next.link=volume-playback.html @jd:body diff --git a/docs/html/training/notify-user/build-notification.jd b/docs/html/training/notify-user/build-notification.jd index ba66028..80f2cd5 100644 --- a/docs/html/training/notify-user/build-notification.jd +++ b/docs/html/training/notify-user/build-notification.jd @@ -149,12 +149,14 @@ specifications.</li> <p>For example:</p> <pre> +NotificationCompat.Builder mBuilder; +... // Sets an ID for the notification int mNotificationId = 001; // Gets an instance of the NotificationManager service NotificationManager mNotifyMgr = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); // Builds the notification and issues it. -mNotifyMgr.notify(mNotificationId, builder.build()); +mNotifyMgr.notify(mNotificationId, mBuilder.build()); </pre> diff --git a/docs/html/training/sharing/index.jd b/docs/html/training/sharing/index.jd index c2e8dbc..2aa22b6 100644 --- a/docs/html/training/sharing/index.jd +++ b/docs/html/training/sharing/index.jd @@ -1,9 +1,8 @@ page.title=Sharing Content +page.tags="intents","share" trainingnavtop=true startpage=true -next.title=Sending Content to Other Apps -next.link=send.html @jd:body diff --git a/docs/html/training/training_toc.cs b/docs/html/training/training_toc.cs index 40273f8..7a3f2ca 100644 --- a/docs/html/training/training_toc.cs +++ b/docs/html/training/training_toc.cs @@ -287,6 +287,10 @@ Caching Bitmaps </a> </li> + <li><a href="<?cs var:toroot ?>training/displaying-bitmaps/manage-memory.html"> + Managing Bitmap Memory + </a> + </li> <li><a href="<?cs var:toroot ?>training/displaying-bitmaps/display-bitmap.html"> Displaying Bitmaps in Your UI </a></li> |
