diff options
Diffstat (limited to 'docs/html/guide/topics')
10 files changed, 34 insertions, 24 deletions
diff --git a/docs/html/guide/topics/connectivity/wifip2p.jd b/docs/html/guide/topics/connectivity/wifip2p.jd index 82c9abd..bbf30fd 100644 --- a/docs/html/guide/topics/connectivity/wifip2p.jd +++ b/docs/html/guide/topics/connectivity/wifip2p.jd @@ -237,16 +237,16 @@ page.title=Wi-Fi Direct */ public class WiFiDirectBroadcastReceiver extends BroadcastReceiver { - private WifiP2pManager manager; - private Channel channel; - private MyWiFiActivity activity; + private WifiP2pManager mManager; + private Channel mChannel; + private MyWiFiActivity mActivity; public WiFiDirectBroadcastReceiver(WifiP2pManager manager, Channel channel, MyWifiActivity activity) { super(); - this.manager = manager; - this.channel = channel; - this.activity = activity; + this.mManager = manager; + this.mChannel = channel; + this.mActivity = activity; } @Override @@ -333,7 +333,7 @@ protected void onCreate(Bundle savedInstanceState){ ... mManager = (WifiP2pManager) getSystemService(Context.WIFI_P2P_SERVICE); mChannel = mManager.initialize(this, getMainLooper(), null); - mReceiver = new WiFiDirectBroadcastReceiver(manager, channel, this); + mReceiver = new WiFiDirectBroadcastReceiver(mManager, mChannel, this); ... } </pre> @@ -397,7 +397,7 @@ protected void onPause() { that the discovery process succeeded and does not provide any information about the actual peers that it discovered, if any:</p> <pre> -manager.discoverPeers(channel, new WifiP2pManager.ActionListener() { +mManager.discoverPeers(channel, new WifiP2pManager.ActionListener() { @Override public void onSuccess() { ... @@ -425,8 +425,8 @@ if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) { // request available peers from the wifi p2p manager. This is an // asynchronous call and the calling activity is notified with a // callback on PeerListListener.onPeersAvailable() - if (manager != null) { - manager.requestPeers(channel, myPeerListListener); + if (mManager != null) { + mManager.requestPeers(mChannel, myPeerListListener); } } </pre> @@ -453,7 +453,7 @@ if (WifiP2pManager.WIFI_P2P_PEERS_CHANGED_ACTION.equals(action)) { WifiP2pDevice device; WifiP2pConfig config = new WifiP2pConfig(); config.deviceAddress = device.deviceAddress; -manager.connect(channel, config, new ActionListener() { +mManager.connect(mChannel, config, new ActionListener() { @Override public void onSuccess() { diff --git a/docs/html/guide/topics/location/strategies.jd b/docs/html/guide/topics/location/strategies.jd index f790953..6cc8f1a 100644 --- a/docs/html/guide/topics/location/strategies.jd +++ b/docs/html/guide/topics/location/strategies.jd @@ -202,9 +202,9 @@ accuracy.</p> android.location.LocationManager#requestLocationUpdates requestLocationUpdates()}:</p> <pre> -LocationProvider locationProvider = LocationManager.NETWORK_PROVIDER; +String locationProvider = LocationManager.NETWORK_PROVIDER; // Or, use GPS location data: -// LocationProvider locationProvider = LocationManager.GPS_PROVIDER; +// String locationProvider = LocationManager.GPS_PROVIDER; locationManager.requestLocationUpdates(locationProvider, 0, 0, locationListener); </pre> @@ -217,7 +217,7 @@ long for users wait. Until a more accurate location is provided to your location should utilize a cached location by calling {@link android.location.LocationManager#getLastKnownLocation}:</p> <pre> -LocationProvider locationProvider = LocationManager.NETWORK_PROVIDER; +String locationProvider = LocationManager.NETWORK_PROVIDER; // Or use LocationManager.GPS_PROVIDER Location lastKnownLocation = locationManager.getLastKnownLocation(locationProvider); diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd index a130f7d..d25a513 100644 --- a/docs/html/guide/topics/manifest/manifest-intro.jd +++ b/docs/html/guide/topics/manifest/manifest-intro.jd @@ -115,6 +115,7 @@ other mention of the element name. <a href="{@docRoot}guide/topics/manifest/provider-element.html"><provider></a> <a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html"><grant-uri-permission /></a> <a href="{@docRoot}guide/topics/manifest/meta-data-element.html"><meta-data /></a> + <a href="{@docRoot}guide/topics/manifest/path-permission-element.html"><path-permission /></a> <a href="{@docRoot}guide/topics/manifest/provider-element.html"></provider></a> <a href="{@docRoot}guide/topics/manifest/uses-library-element.html"><uses-library /></a> diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd index c25dff8..3d6f18b 100644 --- a/docs/html/guide/topics/manifest/uses-feature-element.jd +++ b/docs/html/guide/topics/manifest/uses-feature-element.jd @@ -708,9 +708,9 @@ device.</td> <td>Television</td> <td><code>android.hardware.type.television</code></td> <td>The application is designed for a television user experience.</td> - <td>>This feature defines "television" to be a typical living room television experience: + <td>This feature defines "television" to be a typical living room television experience: displayed on a big screen, where the user is sitting far away and the dominant form of - input is be something like a d-pad, and generally not through touch or a + input is something like a d-pad, and generally not through touch or a mouse/pointer-device.</td> </tr> diff --git a/docs/html/guide/topics/renderscript/index.jd b/docs/html/guide/topics/renderscript/index.jd index 4c22e72..b5c53ff 100644 --- a/docs/html/guide/topics/renderscript/index.jd +++ b/docs/html/guide/topics/renderscript/index.jd @@ -9,6 +9,15 @@ page.landing.image= <div> <h3>Blog Articles</h3> + + <a +href="http://android-developers.blogspot.com/2013/01/evolution-of-renderscript-performance.html"> + <h4>Evolution of Renderscript Performance</h4> + <p>It’s been a year since the last blog post on Renderscript, and with the release + of Android 4.2, it’s a good time to talk about the performance work that we’ve done + since then. One of the major goals of this past year was to improve the performance + of common image-processing operations with Renderscript.</p> </a> + <a href="http://android-developers.blogspot.com/2012/01/levels-in-renderscript.html"> <h4>Levels in Renderscript</h4> diff --git a/docs/html/guide/topics/resources/layout-resource.jd b/docs/html/guide/topics/resources/layout-resource.jd index cd88ae9..380ab15 100644 --- a/docs/html/guide/topics/resources/layout-resource.jd +++ b/docs/html/guide/topics/resources/layout-resource.jd @@ -264,7 +264,7 @@ guide. <pre> public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - setContentView.(R.layout.main_activity); + setContentView(R.layout.main_activity); } </pre> </dd> <!-- end example --> @@ -279,4 +279,4 @@ public void onCreate(Bundle savedInstanceState) { </ul> </dd> -</dl>
\ No newline at end of file +</dl> diff --git a/docs/html/guide/topics/resources/more-resources.jd b/docs/html/guide/topics/resources/more-resources.jd index 9fa1a2d..b5f449a 100644 --- a/docs/html/guide/topics/resources/more-resources.jd +++ b/docs/html/guide/topics/resources/more-resources.jd @@ -575,7 +575,7 @@ ID to reference the array.</dd> </dl> </dd> <dt id="integer-array-item-element"><code><item></code></dt> - <dd>An integer. The value can be a referenced to another + <dd>An integer. The value can be a reference to another integer resource. Must be a child of a {@code <integer-array>} element. <p>No attributes.</p> </dd> diff --git a/docs/html/guide/topics/resources/string-resource.jd b/docs/html/guide/topics/resources/string-resource.jd index da410a4..5a96ba1 100644 --- a/docs/html/guide/topics/resources/string-resource.jd +++ b/docs/html/guide/topics/resources/string-resource.jd @@ -177,7 +177,7 @@ ID to reference the array.</dd> </dd> <dt id="string-array-item-element"><code><item></code></dt> - <dd>A string, which can include styling tags. The value can be a referenced to another + <dd>A string, which can include styling tags. The value can be a reference to another string resource. Must be a child of a {@code <string-array>} element. Beware that you must escape apostrophes and quotation marks. See <a href="#FormattingAndStyling">Formatting and Styling</a>, below, for @@ -303,7 +303,7 @@ resource ID.</dd> </dd> <dt id="plurals-item-element"><code><item></code></dt> - <dd>A plural or singular string. The value can be a referenced to another + <dd>A plural or singular string. The value can be a reference to another string resource. Must be a child of a {@code <plurals>} element. Beware that you must escape apostrophes and quotation marks. See <a href="#FormattingAndStyling">Formatting and Styling</a>, below, for information about to properly style and format your strings. diff --git a/docs/html/guide/topics/ui/layout/gridview.jd b/docs/html/guide/topics/ui/layout/gridview.jd index 67bdd0f..84c3dab 100644 --- a/docs/html/guide/topics/ui/layout/gridview.jd +++ b/docs/html/guide/topics/ui/layout/gridview.jd @@ -170,7 +170,7 @@ image is resized and cropped to fit in these dimensions, as appropriate.</li> be cropped toward the center (if necessary).</li> <li>{@link android.widget.ImageView#setPadding(int,int,int,int)} defines the padding for all sides. (Note that, if the images have different aspect-ratios, then less -padding will cause for more cropping of the image if it does not match +padding will cause more cropping of the image if it does not match the dimensions given to the ImageView.)</li> </ul> diff --git a/docs/html/guide/topics/ui/notifiers/notifications.jd b/docs/html/guide/topics/ui/notifiers/notifications.jd index 8026b7d..e70987b 100644 --- a/docs/html/guide/topics/ui/notifiers/notifications.jd +++ b/docs/html/guide/topics/ui/notifiers/notifications.jd @@ -700,7 +700,7 @@ mNotificationManager.notify(id, builder.build()); element for the {@link android.app.Activity} <dl> <dt> -<code><a href="guide/topics/manifest/activity-element.html#nm">android:name</a>="<i>activityclass</i>"</code> +<code><a href="{@docRoot}guide/topics/manifest/activity-element.html#nm">android:name</a>="<i>activityclass</i>"</code> </dt> <dd> The activity's fully-qualified class name. @@ -921,7 +921,7 @@ mNotifyManager.notify(0, mBuilder.build()); </p> <pre> // Sets an activity indicator for an operation of indeterminate length -mBuilder.setProgress(0, 0, false); +mBuilder.setProgress(0, 0, true); // Issues the notification mNotifyManager.notify(0, mBuilder.build()); </pre> |