diff options
Diffstat (limited to 'core/java/android/app')
| -rw-r--r-- | core/java/android/app/Activity.java | 4 | ||||
| -rw-r--r-- | core/java/android/app/Dialog.java | 2 | ||||
| -rw-r--r-- | core/java/android/app/PendingIntent.java | 2 | ||||
| -rw-r--r-- | core/java/android/app/Service.java | 2 | ||||
| -rw-r--r-- | core/java/android/app/admin/DeviceAdminReceiver.java | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java index f895431..599487d 100644 --- a/core/java/android/app/Activity.java +++ b/core/java/android/app/Activity.java @@ -203,8 +203,8 @@ import java.util.HashMap; * with the user. Between these two methods you can maintain resources that * are needed to show the activity to the user. For example, you can register * a {@link android.content.BroadcastReceiver} in onStart() to monitor for changes - * that impact your UI, and unregister it in onStop() when the user an no - * longer see what you are displaying. The onStart() and onStop() methods + * that impact your UI, and unregister it in onStop() when the user no + * longer sees what you are displaying. The onStart() and onStop() methods * can be called multiple times, as the activity becomes visible and hidden * to the user. * diff --git a/core/java/android/app/Dialog.java b/core/java/android/app/Dialog.java index f1ce2bb..f04ff6a 100644 --- a/core/java/android/app/Dialog.java +++ b/core/java/android/app/Dialog.java @@ -591,7 +591,7 @@ public class Dialog implements DialogInterface, Window.Callback, } /** - * Called when an key shortcut event is not handled by any of the views in the Dialog. + * Called when a key shortcut event is not handled by any of the views in the Dialog. * Override this method to implement global key shortcuts for the Dialog. * Key shortcuts can also be implemented by setting the * {@link MenuItem#setShortcut(char, char) shortcut} property of menu items. diff --git a/core/java/android/app/PendingIntent.java b/core/java/android/app/PendingIntent.java index b0637a7..c95066c 100644 --- a/core/java/android/app/PendingIntent.java +++ b/core/java/android/app/PendingIntent.java @@ -351,7 +351,7 @@ public final class PendingIntent implements Parcelable { /** * Cancel a currently active PendingIntent. Only the original application - * owning an PendingIntent can cancel it. + * owning a PendingIntent can cancel it. */ public void cancel() { try { diff --git a/core/java/android/app/Service.java b/core/java/android/app/Service.java index be4b8af..207ae76 100644 --- a/core/java/android/app/Service.java +++ b/core/java/android/app/Service.java @@ -453,7 +453,7 @@ public abstract class Service extends ContextWrapper implements ComponentCallbac /** * Called by the system to notify a Service that it is no longer used and is being removed. The - * service should clean up an resources it holds (threads, registered + * service should clean up any resources it holds (threads, registered * receivers, etc) at this point. Upon return, there will be no more calls * in to this Service object and it is effectively dead. Do not call this method directly. */ diff --git a/core/java/android/app/admin/DeviceAdminReceiver.java b/core/java/android/app/admin/DeviceAdminReceiver.java index 43cd330..30b65de 100644 --- a/core/java/android/app/admin/DeviceAdminReceiver.java +++ b/core/java/android/app/admin/DeviceAdminReceiver.java @@ -165,7 +165,7 @@ public class DeviceAdminReceiver extends BroadcastReceiver { = "android.app.action.ACTION_PASSWORD_EXPIRING"; /** - * Name under which an DevicePolicy component publishes information + * Name under which a DevicePolicy component publishes information * about itself. This meta-data must reference an XML resource containing * a device-admin tag. XXX TO DO: describe syntax. */ |