diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-11-18 10:11:10 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2014-11-18 10:41:09 -0800 |
| commit | ad6a99b32a0d062c967019e5cd9858071a9c6617 (patch) | |
| tree | 29318c20f2b9ccd492878f228fc46d7533f72739 /core/java/android/provider | |
| parent | 3a9a53cb75890484687c75b6fb134d21f2e7a334 (diff) | |
| download | frameworks_base-ad6a99b32a0d062c967019e5cd9858071a9c6617.zip frameworks_base-ad6a99b32a0d062c967019e5cd9858071a9c6617.tar.gz frameworks_base-ad6a99b32a0d062c967019e5cd9858071a9c6617.tar.bz2 | |
Add time estimates to batterystats dump.
Also fix some java docs.
Change-Id: Ie705f236db6f06e34fa5581c20852e5c8f7c2c17
Diffstat (limited to 'core/java/android/provider')
| -rw-r--r-- | core/java/android/provider/Settings.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 1f45f0a..0be4aea 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -984,8 +984,8 @@ public final class Settings { * InputDeviceIdentifier. This field is used by some activities to jump straight into the * settings for the given device. * <p> - * Example: The {@link #INPUT_METHOD_SETTINGS} intent opens the keyboard layout dialog for the - * given device. + * Example: The {@link #ACTION_INPUT_METHOD_SETTINGS} intent opens the keyboard layout + * dialog for the given device. * @hide */ public static final String EXTRA_INPUT_DEVICE_IDENTIFIER = "input_device_identifier"; @@ -4816,7 +4816,7 @@ public final class Settings { * The timeout in milliseconds before the device fully goes to sleep after * a period of inactivity. This value sets an upper bound on how long the device * will stay awake or dreaming without user activity. It should generally - * be longer than {@link #SCREEN_OFF_TIMEOUT} as otherwise the device + * be longer than {@link Settings.System#SCREEN_OFF_TIMEOUT} as otherwise the device * will sleep before it ever has a chance to dream. * <p> * Use -1 to disable this timeout. |