diff options
| author | Scott Kennedy <skennedy@google.com> | 2013-01-11 22:31:43 -0800 |
|---|---|---|
| committer | Scott Kennedy <skennedy@google.com> | 2013-01-11 23:44:11 -0800 |
| commit | 7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8 (patch) | |
| tree | a78e3e87fc9b51fd0df8baa26d4415f4124492ba /core/java/android | |
| parent | 0bb4dade30d3413cc7951c5d2c0ee761a93ae468 (diff) | |
docs: Fix a bunch of issues
External tracker 42609
External tracker 42607
External tracker 42604
External tracker 42600
External tracker 42574
External tracker 42450
External tracker 41050
External tracker 40995
External tracker 40970
External tracker 40935
External tracker 40507
External tracker 40481
External tracker 40435
External tracker 40406
External tracker 40297
External tracker 40281
External tracker 39978
External tracker 39929
External tracker 39803
External tracker 39715
External tracker 39441
Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
Diffstat (limited to 'core/java/android')
| -rw-r--r-- | core/java/android/app/AlertDialog.java | 2 | ||||
| -rw-r--r-- | core/java/android/app/admin/DeviceAdminInfo.java | 4 | ||||
| -rw-r--r-- | core/java/android/content/BroadcastReceiver.java | 2 | ||||
| -rw-r--r-- | core/java/android/hardware/SensorEventListener.java | 2 | ||||
| -rwxr-xr-x | core/java/android/provider/ContactsContract.java | 3 | ||||
| -rw-r--r-- | core/java/android/widget/PopupWindow.java | 2 |
6 files changed, 8 insertions, 7 deletions
diff --git a/core/java/android/app/AlertDialog.java b/core/java/android/app/AlertDialog.java index 6ab2bd1c2e90..10d5e253fb90 100644 --- a/core/java/android/app/AlertDialog.java +++ b/core/java/android/app/AlertDialog.java @@ -90,7 +90,7 @@ public class AlertDialog extends Dialog implements DialogInterface { /** * Special theme constant for {@link #AlertDialog(Context, int)}: use - * the device's default alert theme with a dark background. + * the device's default alert theme with a light background. */ public static final int THEME_DEVICE_DEFAULT_LIGHT = 5; diff --git a/core/java/android/app/admin/DeviceAdminInfo.java b/core/java/android/app/admin/DeviceAdminInfo.java index b35181158df8..66fc816201e7 100644 --- a/core/java/android/app/admin/DeviceAdminInfo.java +++ b/core/java/android/app/admin/DeviceAdminInfo.java @@ -139,9 +139,9 @@ public final class DeviceAdminInfo implements Parcelable { public static final int USES_POLICY_DISABLE_CAMERA = 8; /** - * A type of policy that this device admin can use: disables use of keyguard widgets. + * A type of policy that this device admin can use: disables use of keyguard features. * - * <p>To control this policy, the device admin must have a "disable-keyguard-widgets" + * <p>To control this policy, the device admin must have a "disable-keyguard-features" * tag in the "uses-policies" section of its meta-data. */ public static final int USES_POLICY_DISABLE_KEYGUARD_FEATURES = 9; diff --git a/core/java/android/content/BroadcastReceiver.java b/core/java/android/content/BroadcastReceiver.java index 1500b009a306..4f42d50f3684 100644 --- a/core/java/android/content/BroadcastReceiver.java +++ b/core/java/android/content/BroadcastReceiver.java @@ -117,7 +117,7 @@ import android.util.Slog; * * <ul> * <li><p>The Intent namespace is global. Make sure that Intent action names and - * other strings are written in a namespace you own, or else you may inadvertantly + * other strings are written in a namespace you own, or else you may inadvertently * conflict with other applications. * <li><p>When you use {@link Context#registerReceiver(BroadcastReceiver, IntentFilter)}, * <em>any</em> application may send broadcasts to that registered receiver. You can diff --git a/core/java/android/hardware/SensorEventListener.java b/core/java/android/hardware/SensorEventListener.java index 716d0d473474..677d244fdceb 100644 --- a/core/java/android/hardware/SensorEventListener.java +++ b/core/java/android/hardware/SensorEventListener.java @@ -30,7 +30,7 @@ public interface SensorEventListener { * * <p><b>NOTE:</b> The application doesn't own the * {@link android.hardware.SensorEvent event} - * object passed as a parameter and therefore cannot hold on o it. + * object passed as a parameter and therefore cannot hold on to it. * The object may be part of an internal pool and may be reused by * the framework. * diff --git a/core/java/android/provider/ContactsContract.java b/core/java/android/provider/ContactsContract.java index 5b49ba344e25..8f54a38523ed 100755 --- a/core/java/android/provider/ContactsContract.java +++ b/core/java/android/provider/ContactsContract.java @@ -4695,7 +4695,8 @@ public final class ContactsContract { * The content:// style URI for this table. Append the phone number you want to lookup * to this URI and query it to perform a lookup. For example: * <pre> - * Uri lookupUri = Uri.withAppendedPath(PhoneLookup.CONTENT_URI, Uri.encode(phoneNumber)); + * Uri lookupUri = Uri.withAppendedPath(PhoneLookup.CONTENT_FILTER_URI, + * Uri.encode(phoneNumber)); * </pre> */ public static final Uri CONTENT_FILTER_URI = Uri.withAppendedPath(AUTHORITY_URI, diff --git a/core/java/android/widget/PopupWindow.java b/core/java/android/widget/PopupWindow.java index b71649ad817d..14607376a932 100644 --- a/core/java/android/widget/PopupWindow.java +++ b/core/java/android/widget/PopupWindow.java @@ -42,7 +42,7 @@ import java.lang.ref.WeakReference; /** * <p>A popup window that can be used to display an arbitrary view. The popup - * windows is a floating container that appears on top of the current + * window is a floating container that appears on top of the current * activity.</p> * * @see android.widget.AutoCompleteTextView |
