diff options
Diffstat (limited to 'core/java')
| -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 6ab2bd1..10d5e25 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 b351811..66fc816 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 1500b00..4f42d50 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 716d0d4..677d244 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 5b49ba3..8f54a38 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 b71649a..1460737 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 |