diff options
author | Narayan Kamath <narayan@google.com> | 2014-03-11 18:42:30 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-03-11 18:42:30 +0000 |
commit | 59ed568fa5f723588de8ed0e2309b5d309931a2d (patch) | |
tree | 62ae0852fbbc5c3d5450a0eb35c3831703214bab /core/java/android/content | |
parent | 1aa55954672b68473e6f086448735b57b9e33fba (diff) | |
parent | cd4874cfdc00d17454529b5dca85a487c7c2de77 (diff) | |
download | frameworks_base-59ed568fa5f723588de8ed0e2309b5d309931a2d.zip frameworks_base-59ed568fa5f723588de8ed0e2309b5d309931a2d.tar.gz frameworks_base-59ed568fa5f723588de8ed0e2309b5d309931a2d.tar.bz2 |
am cd4874cf: am d265bcc4: Merge "Inform libcore of time format pref. changes."
* commit 'cd4874cfdc00d17454529b5dca85a487c7c2de77':
Inform libcore of time format pref. changes.
Diffstat (limited to 'core/java/android/content')
-rw-r--r-- | core/java/android/content/Intent.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index 3c66b68..a50b650 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -3331,6 +3331,15 @@ public class Intent implements Parcelable, Cloneable { public static final String EXTRA_SHUTDOWN_USERSPACE_ONLY = "android.intent.extra.SHUTDOWN_USERSPACE_ONLY"; + /** + * Optional boolean extra for {@link #ACTION_TIME_CHANGED} that indicates the + * user has set their time format preferences to the 24 hour format. + * + * @hide for internal use only. + */ + public static final String EXTRA_TIME_PREF_24_HOUR_FORMAT = + "android.intent.extra.TIME_PREF_24_HOUR_FORMAT"; + // --------------------------------------------------------------------- // --------------------------------------------------------------------- // Intent flags (see mFlags variable). |