diff options
author | Dianne Hackborn <hackbod@google.com> | 2009-09-07 00:49:58 -0700 |
---|---|---|
committer | Dianne Hackborn <hackbod@google.com> | 2009-09-07 22:48:02 -0700 |
commit | eb034652c2037a47ebfd99779e8383bb8bb528af (patch) | |
tree | 0d4f6d9b752d6be70083cdf51085872e52610c3b /core/java/android/content/Intent.java | |
parent | 9c93007bcdf684cd15fd9db0cf1eae238dd38191 (diff) | |
download | frameworks_base-eb034652c2037a47ebfd99779e8383bb8bb528af.zip frameworks_base-eb034652c2037a47ebfd99779e8383bb8bb528af.tar.gz frameworks_base-eb034652c2037a47ebfd99779e8383bb8bb528af.tar.bz2 |
Implement all of the infrastructure for configuring wallpapers.
Actually being able to configure a wallpaper relies on additional
work in the launcher and wallpapers that will be in another change.
Also note that this breaks all existing wallpapers, since they now
need to include a meta-data item about themselves. This also
will be fixed in another change.
Change-Id: I97d2c2bd07237abc32f92b9147c32530a2f73c71
Diffstat (limited to 'core/java/android/content/Intent.java')
-rw-r--r-- | core/java/android/content/Intent.java | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index e8b2984..c053ace 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1929,6 +1929,15 @@ public class Intent implements Parcelable { public static final String EXTRA_TITLE = "android.intent.extra.TITLE"; /** + * A Parcelable[] of {@link Intent} or + * {@link android.content.pm.LabeledIntent} objects as set with + * {@link #putExtra(String, Parcelable[])} of additional activities to place + * a the front of the list of choices, when shown to the user with a + * {@link #ACTION_CHOOSER}. + */ + public static final String EXTRA_INITIAL_INTENTS = "android.intent.extra.INITIAL_INTENTS"; + + /** * A {@link android.view.KeyEvent} object containing the event that * triggered the creation of the Intent it is in. */ @@ -5067,7 +5076,8 @@ public class Intent implements Parcelable { } }; - private Intent(Parcel in) { + /** @hide */ + protected Intent(Parcel in) { readFromParcel(in); } |