diff options
Diffstat (limited to 'docs/html/guide')
| -rw-r--r-- | docs/html/guide/components/activities.jd | 4 | ||||
| -rw-r--r-- | docs/html/guide/components/aidl.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/components/bound-services.jd | 4 | ||||
| -rw-r--r-- | docs/html/guide/topics/connectivity/wifip2p.jd | 22 | ||||
| -rw-r--r-- | docs/html/guide/topics/location/strategies.jd | 4 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/manifest-intro.jd | 1 | ||||
| -rw-r--r-- | docs/html/guide/topics/manifest/uses-feature-element.jd | 4 | ||||
| -rw-r--r-- | docs/html/guide/topics/resources/layout-resource.jd | 4 | ||||
| -rw-r--r-- | docs/html/guide/topics/resources/string-resource.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/layout/gridview.jd | 2 | ||||
| -rw-r--r-- | docs/html/guide/topics/ui/notifiers/notifications.jd | 4 | ||||
| -rw-r--r-- | docs/html/guide/webapps/webview.jd | 2 |
12 files changed, 28 insertions, 27 deletions
diff --git a/docs/html/guide/components/activities.jd b/docs/html/guide/components/activities.jd index 36f651f..2897804 100644 --- a/docs/html/guide/components/activities.jd +++ b/docs/html/guide/components/activities.jd @@ -691,7 +691,7 @@ restored, by default).</p> android.app.Activity#onSaveInstanceState onSaveInstanceState()} helps save the state of the UI, if you override the method in order to save additional state information, you should always call the superclass implementation of {@link android.app.Activity#onSaveInstanceState onSaveInstanceState()} -before doing any work. Likewise, you should also call the supercall implementation of {@link +before doing any work. Likewise, you should also call the superclass implementation of {@link android.app.Activity#onRestoreInstanceState onRestoreInstanceState()} if you override it, so the default implementation can restore view states.</p> @@ -773,4 +773,4 @@ android.app.Activity#onStop onStop()}.</p> enables user multitasking, continue with the <b><a href="{@docRoot}guide/components/tasks-and-back-stack.html">Tasks and Back Stack</a></b> document.</p> --->
\ No newline at end of file +--> diff --git a/docs/html/guide/components/aidl.jd b/docs/html/guide/components/aidl.jd index 805b7ec..0be6e6f 100644 --- a/docs/html/guide/components/aidl.jd +++ b/docs/html/guide/components/aidl.jd @@ -208,7 +208,7 @@ YourInterface.Stub}) and declares all the methods from the {@code .aidl} file.</ defines a few helper methods, most notably {@code asInterface()}, which takes an {@link android.os.IBinder} (usually the one passed to a client's {@link android.content.ServiceConnection#onServiceConnected onServiceConnected()} callback method) and -returns an instance of the stub interface. See the section <a href="#calling">Calling an IPC +returns an instance of the stub interface. See the section <a href="#Calling">Calling an IPC Method</a> for more details on how to make this cast.</p> <p>To implement the interface generated from the {@code .aidl}, extend the generated {@link diff --git a/docs/html/guide/components/bound-services.jd b/docs/html/guide/components/bound-services.jd index 8d2bba5..653c7a0 100644 --- a/docs/html/guide/components/bound-services.jd +++ b/docs/html/guide/components/bound-services.jd @@ -578,7 +578,7 @@ private ServiceConnection mConnection = new ServiceConnection() { </pre> <p>With this {@link android.content.ServiceConnection}, the client can bind to a service by passing -this it to {@link android.content.Context#bindService bindService()}. For example:</p> +it to {@link android.content.Context#bindService bindService()}. For example:</p> <pre> Intent intent = new Intent(this, LocalService.class); @@ -667,7 +667,7 @@ Below, figure 1 illustrates the logic for this kind of lifecycle.</p> and also allows binding.</p> -<p>For more information about the lifecycle of an started service, see the <a +<p>For more information about the lifecycle of a started service, see the <a href="{@docRoot}guide/components/services.html#Lifecycle">Services</a> document.</p> 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..404b797 100644 --- a/docs/html/guide/topics/location/strategies.jd +++ b/docs/html/guide/topics/location/strategies.jd @@ -202,7 +202,7 @@ 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; @@ -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/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/string-resource.jd b/docs/html/guide/topics/resources/string-resource.jd index da410a4..27761e2 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 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> diff --git a/docs/html/guide/webapps/webview.jd b/docs/html/guide/webapps/webview.jd index ce7fe27..f8b2a1d 100644 --- a/docs/html/guide/webapps/webview.jd +++ b/docs/html/guide/webapps/webview.jd @@ -314,7 +314,7 @@ to navigate backward:</p> @Override public boolean {@link android.app.Activity#onKeyDown(int,KeyEvent) onKeyDown}(int keyCode, KeyEvent event) { // Check if the key event was the Back button and if there's history - if ((keyCode == KeyEvent.KEYCODE_BACK) && myWebView.{@link android.webkit.WebView#canGoBack() canGoBack}() { + if ((keyCode == KeyEvent.KEYCODE_BACK) && myWebView.{@link android.webkit.WebView#canGoBack() canGoBack}()) { myWebView.{@link android.webkit.WebView#goBack() goBack}(); return true; } |