summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2013-01-08 12:52:38 -0800
committer Android Git Automerger <android-git-automerger@android.com> 2013-01-08 12:52:38 -0800
commit8a05d13ef656b0147d85e1826b70a55f6b32e1e3 (patch)
treecdb0b15c9a6a2ddc63b71d9c6eda4826de44b6de
parent3ccb33d5e08a0f444d16be894827dcbdfd0db42f (diff)
parent5b56d43237d959403bb8a32de25376deee2dab22 (diff)
am 5b56d432: am 9107fa5d: am 66adf0d0: am 70af3cdb: Merge "docs: resolve bugs from external tracker" into jb-mr1-dev
* commit '5b56d43237d959403bb8a32de25376deee2dab22': docs: resolve bugs from external tracker
Diffstat
-rw-r--r--core/java/android/appwidget/AppWidgetManager.java2
-rw-r--r--core/java/android/os/FileObserver.java2
-rw-r--r--core/java/android/webkit/package.html6
-rw-r--r--docs/html/google/play/billing/billing_integrate.jd17
-rw-r--r--docs/html/guide/topics/connectivity/wifip2p.jd22
-rw-r--r--docs/html/guide/topics/manifest/manifest-intro.jd1
-rw-r--r--docs/html/guide/topics/ui/layout/gridview.jd2
-rw-r--r--docs/html/training/basics/activity-lifecycle/recreating.jd2
-rw-r--r--docs/html/training/basics/activity-lifecycle/starting.jd2
-rw-r--r--docs/html/training/basics/data-storage/shared-preferences.jd4
-rw-r--r--docs/html/training/basics/network-ops/xml.jd2
-rw-r--r--docs/html/training/basics/supporting-devices/screens.jd2
-rw-r--r--docs/html/training/custom-views/index.jd8
-rw-r--r--docs/html/training/managing-audio/volume-playback.jd2
-rw-r--r--docs/html/training/multiple-apks/texture.jd4
-rw-r--r--docs/html/training/sharing/send.jd2
16 files changed, 41 insertions, 39 deletions
diff --git a/core/java/android/appwidget/AppWidgetManager.java b/core/java/android/appwidget/AppWidgetManager.java
index 9c19766663ed..6b1c3e2ba558 100644
--- a/core/java/android/appwidget/AppWidgetManager.java
+++ b/core/java/android/appwidget/AppWidgetManager.java
@@ -239,7 +239,7 @@ public class AppWidgetManager {
public static final String EXTRA_CUSTOM_SORT = "customSort";
/**
- * A sentiel value that the AppWidget manager will never return as a appWidgetId.
+ * A sentinel value that the AppWidget manager will never return as a appWidgetId.
*/
public static final int INVALID_APPWIDGET_ID = 0;
diff --git a/core/java/android/os/FileObserver.java b/core/java/android/os/FileObserver.java
index 667ce68570f4..d6334861597c 100644
--- a/core/java/android/os/FileObserver.java
+++ b/core/java/android/os/FileObserver.java
@@ -32,7 +32,7 @@ import java.util.HashMap;
*
* <p>Each FileObserver instance monitors a single file or directory.
* If a directory is monitored, events will be triggered for all files and
- * subdirectories (recursively) inside the monitored directory.</p>
+ * subdirectories inside the monitored directory.</p>
*
* <p>An event mask is used to specify which changes or actions to report.
* Event type constants are used to describe the possible changes in the
diff --git a/core/java/android/webkit/package.html b/core/java/android/webkit/package.html
index 4ed08da1dc02..7182488748ed 100644
--- a/core/java/android/webkit/package.html
+++ b/core/java/android/webkit/package.html
@@ -1,7 +1,7 @@
<html>
<body>
-Provides tools for browsing the web.
-<p>The only classes or interfaces in this package intended for use by SDK
-developers are WebView, BroswerCallbackAdapter, BrowserCallback, and CookieManager.
+<p>Provides tools for browsing the web.
+<p>For more information about building apps with web-based content, see the
+<a href="{@docRoot}guide/webapps/overview.html">Web Apps Overview</a>.
</body>
</html> \ No newline at end of file
diff --git a/docs/html/google/play/billing/billing_integrate.jd b/docs/html/google/play/billing/billing_integrate.jd
index 405c58ab7ebd..3f6df927147a 100644
--- a/docs/html/google/play/billing/billing_integrate.jd
+++ b/docs/html/google/play/billing/billing_integrate.jd
@@ -111,20 +111,21 @@ ServiceConnection mServiceConn = new ServiceConnection() {
<pre>
&#64;Override
public void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- setContentView(R.layout.activity_main);
- bindService(new
- Intent("com.android.vending.billing.InAppBillingService.BIND"),
- mServiceConn, Context.BIND_AUTO_CREATE);
+ super.onCreate(savedInstanceState);
+ setContentView(R.layout.activity_main);
+ bindService(new
+ Intent("com.android.vending.billing.InAppBillingService.BIND"),
+ mServiceConn, Context.BIND_AUTO_CREATE);
</pre>
<p>You can now use the mService reference to communicate with the Google Play service.</p>
<p class="note"><strong>Important:</strong> Remember to unbind from the In-app Billing service when you are done with your {@link android.app.Activity}. If you don’t unbind, the open service connection could cause your device’s performance to degrade. This example shows how to perform the unbind operation on a service connection to In-app Billing called {@code mServiceConn} by overriding the activity’s {@link android.app.Activity#onDestroy onDestroy} method.</p>
<pre>
&#64;Override
public void onDestroy() {
- if (mServiceConn != null) {
- unbindService(mServiceConn);
- }
+ super.onDestroy();
+ if (mServiceConn != null) {
+ unbindService(mServiceConn);
+ }
}
</pre>
diff --git a/docs/html/guide/topics/connectivity/wifip2p.jd b/docs/html/guide/topics/connectivity/wifip2p.jd
index 82c9abdb1066..bbf30fdecece 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;
}
&#064;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() {
&#064;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() {
&#064;Override
public void onSuccess() {
diff --git a/docs/html/guide/topics/manifest/manifest-intro.jd b/docs/html/guide/topics/manifest/manifest-intro.jd
index a130f7d9761e..d25a51335c24 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">&lt;provider&gt;</a>
<a href="{@docRoot}guide/topics/manifest/grant-uri-permission-element.html">&lt;grant-uri-permission /&gt;</a>
<a href="{@docRoot}guide/topics/manifest/meta-data-element.html">&lt;meta-data /&gt;</a>
+ <a href="{@docRoot}guide/topics/manifest/path-permission-element.html">&lt;path-permission /&gt;</a>
<a href="{@docRoot}guide/topics/manifest/provider-element.html">&lt;/provider&gt;</a>
<a href="{@docRoot}guide/topics/manifest/uses-library-element.html">&lt;uses-library /&gt;</a>
diff --git a/docs/html/guide/topics/ui/layout/gridview.jd b/docs/html/guide/topics/ui/layout/gridview.jd
index 67bdd0f080cf..84c3dab78677 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/training/basics/activity-lifecycle/recreating.jd b/docs/html/training/basics/activity-lifecycle/recreating.jd
index 1a65e71f98dd..71fd5dd7babc 100644
--- a/docs/html/training/basics/activity-lifecycle/recreating.jd
+++ b/docs/html/training/basics/activity-lifecycle/recreating.jd
@@ -126,7 +126,7 @@ can save the state of the view hierarchy.</p>
state from the {@link android.os.Bundle} that the system
passes your activity. Both the {@link android.app.Activity#onCreate onCreate()} and {@link
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()} callback methods receive
-the same {@link android.os.Bundle} that containes the instance state information.</p>
+the same {@link android.os.Bundle} that contains the instance state information.</p>
<p>Because the {@link android.app.Activity#onCreate onCreate()} method is called whether the
system is creating a new instance of your activity or recreating a previous one, you must check
diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd
index dd17304d8102..dce6e30c69e0 100644
--- a/docs/html/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html/training/basics/activity-lifecycle/starting.jd
@@ -265,7 +265,7 @@ signal that your activity instance is being completely removed from the system m
with the activity and your activity should perform most cleanup during {@link
android.app.Activity#onPause} and {@link android.app.Activity#onStop}. However, if your
activity includes background threads that you created during {@link
-android.app.Activity#onCreate onCreate()} or other other long-running resources that could
+android.app.Activity#onCreate onCreate()} or other long-running resources that could
potentially leak memory if not properly closed, you should kill them during {@link
android.app.Activity#onDestroy}.</p>
diff --git a/docs/html/training/basics/data-storage/shared-preferences.jd b/docs/html/training/basics/data-storage/shared-preferences.jd
index 67f45cb5c7f2..099da6749819 100644
--- a/docs/html/training/basics/data-storage/shared-preferences.jd
+++ b/docs/html/training/basics/data-storage/shared-preferences.jd
@@ -115,7 +115,7 @@ present. For example:</p>
<pre>
SharedPreferences sharedPref = getActivity().getPreferences(Context.MODE_PRIVATE);
-long default = getResources().getInteger(R.string.saved_high_score_default));
-long highScore = sharedPref.getInt(getString(R.string.saved_high_score), default);
+int defaultValue = getResources().getInteger(R.string.saved_high_score_default);
+long highScore = sharedPref.getInt(getString(R.string.saved_high_score), defaultValue);
</pre>
diff --git a/docs/html/training/basics/network-ops/xml.jd b/docs/html/training/basics/network-ops/xml.jd
index b148257ec7c3..0ea696d53684 100644
--- a/docs/html/training/basics/network-ops/xml.jd
+++ b/docs/html/training/basics/network-ops/xml.jd
@@ -551,5 +551,5 @@ private InputStream downloadUrl(String urlString) throws IOException {
conn.setDoInput(true);
// Starts the query
conn.connect();
- InputStream stream = conn.getInputStream();
+ return conn.getInputStream();
}</pre>
diff --git a/docs/html/training/basics/supporting-devices/screens.jd b/docs/html/training/basics/supporting-devices/screens.jd
index 8697cd5e4cf7..1114f211b420 100644
--- a/docs/html/training/basics/supporting-devices/screens.jd
+++ b/docs/html/training/basics/supporting-devices/screens.jd
@@ -108,7 +108,7 @@ MyProject/
<p>By default, the <code>layout/main.xml</code> file is used for portrait orientation.</p>
-<p>If you want a provide a special layout for landscape, including while on large screens, then
+<p>If you want to provide a special layout for landscape, including while on large screens, then
you need to use both the <code>large</code> and <code>land</code> qualifier:</p>
<pre class="classic no-pretty-print">
diff --git a/docs/html/training/custom-views/index.jd b/docs/html/training/custom-views/index.jd
index 0661c053fc90..cec75b4fb92d 100644
--- a/docs/html/training/custom-views/index.jd
+++ b/docs/html/training/custom-views/index.jd
@@ -17,12 +17,12 @@ next.link=create-view.html
<h2>You should also read</h2>
<ul>
- <li><a href="{@docRoot}/guide/topics/ui/custom-components.html">Custom Components</a>
+ <li><a href="{@docRoot}guide/topics/ui/custom-components.html">Custom Components</a>
</li>
- <li><a href="{@docRoot}/guide/topics/ui/ui-events.html">Input Events</a></li>
- <li><a href="{@docRoot}/guide/topics/graphics/prop-animation.html">Property
+ <li><a href="{@docRoot}guide/topics/ui/ui-events.html">Input Events</a></li>
+ <li><a href="{@docRoot}guide/topics/graphics/prop-animation.html">Property
Animation</a></li>
- <li><a href="{@docRoot}/guide/topics/graphics/hardware-accel.html">Hardware
+ <li><a href="{@docRoot}guide/topics/graphics/hardware-accel.html">Hardware
Acceleration</a></li>
<li><a href="{@docRoot}guide/topics/ui/accessibility/index.html">
Accessibility</a> developer guide</li>
diff --git a/docs/html/training/managing-audio/volume-playback.jd b/docs/html/training/managing-audio/volume-playback.jd
index 76abbb6a17e8..be0f583d50c7 100644
--- a/docs/html/training/managing-audio/volume-playback.jd
+++ b/docs/html/training/managing-audio/volume-playback.jd
@@ -153,4 +153,4 @@ important when your application isn’t visible and therefore can’t be control
UI.</p>
<p>A better approach is to register and unregister the media button event receiver when your
-application gains and losses the audio focus. This is covered in detail in the next lesson.</p>
+application gains and loses the audio focus. This is covered in detail in the next lesson.</p>
diff --git a/docs/html/training/multiple-apks/texture.jd b/docs/html/training/multiple-apks/texture.jd
index e4ea72b9728a..c49cc9546b26 100644
--- a/docs/html/training/multiple-apks/texture.jd
+++ b/docs/html/training/multiple-apks/texture.jd
@@ -90,8 +90,8 @@ cell represents an APK.</p>
<tbody>
<tr>
<td class="blueCell">ETC1</td>
- <td class="greenCell">ATI</td>
- <td class="redCell">PowerVR</td>
+ <td class="redCell">ATI</td>
+ <td class="greenCell">PowerVR</td>
</tr>
</tbody>
</table>
diff --git a/docs/html/training/sharing/send.jd b/docs/html/training/sharing/send.jd
index 741c01792232..15b38e50dc9b 100644
--- a/docs/html/training/sharing/send.jd
+++ b/docs/html/training/sharing/send.jd
@@ -32,7 +32,7 @@ Intent Filters</a></li>
<p>When you construct an intent, you must specify the action you want the intent to "trigger."
Android defines several actions, including {@link android.content.Intent#ACTION_SEND} which, as
you can probably guess, indicates that the intent is sending data from one activity to another,
-even across process boundaries. To send data to another activity, all you need to do is speicify
+even across process boundaries. To send data to another activity, all you need to do is specify
the data and its type, the system will identify compatible receiving activities and display them
to the user (if there are multiple options) or immediately start the activity (if there is only
one option). Similarly, you can advertise the data types that your activities support receiving
generated by cgit v1.2.3-59-g8ed1b (git 2.39.0) at 2025-11-04 03:32:57 +0000