summaryrefslogtreecommitdiffstats
path: root/core/java/android/app
diff options
context:
space:
mode:
authorScott Kennedy <skennedy@google.com>2013-01-11 22:31:43 -0800
committerScott Kennedy <skennedy@google.com>2013-01-11 23:44:11 -0800
commit7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8 (patch)
treea78e3e87fc9b51fd0df8baa26d4415f4124492ba /core/java/android/app
parent0bb4dade30d3413cc7951c5d2c0ee761a93ae468 (diff)
downloadframeworks_base-7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8.zip
frameworks_base-7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8.tar.gz
frameworks_base-7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8.tar.bz2
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/app')
-rw-r--r--core/java/android/app/AlertDialog.java2
-rw-r--r--core/java/android/app/admin/DeviceAdminInfo.java4
2 files changed, 3 insertions, 3 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;