diff options
| author | Dianne Hackborn <hackbod@google.com> | 2009-07-03 08:58:10 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-03 08:58:10 -0700 |
| commit | 5d16cd046298ec9e009cfdd2056c64c1a9ac5ba3 (patch) | |
| tree | 40ec504b10b6deb12ba2cd459641ded41a1fd904 /core | |
| parent | 575d1af980f4b4866325bfc487455f54606cf49e (diff) | |
| parent | d7cd29da91ccc0aba1f1097e19366f9ca36c7ce1 (diff) | |
| download | frameworks_base-5d16cd046298ec9e009cfdd2056c64c1a9ac5ba3.zip frameworks_base-5d16cd046298ec9e009cfdd2056c64c1a9ac5ba3.tar.gz frameworks_base-5d16cd046298ec9e009cfdd2056c64c1a9ac5ba3.tar.bz2 | |
am d7cd29da: Add facility to run setup wizard after an update.
Merge commit 'd7cd29da91ccc0aba1f1097e19366f9ca36c7ce1'
* commit 'd7cd29da91ccc0aba1f1097e19366f9ca36c7ce1':
Add facility to run setup wizard after an update.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/Intent.java | 21 | ||||
| -rw-r--r-- | core/java/android/provider/Settings.java | 7 |
2 files changed, 28 insertions, 0 deletions
diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java index a57084c..ca4bea8 100644 --- a/core/java/android/content/Intent.java +++ b/core/java/android/content/Intent.java @@ -1085,6 +1085,27 @@ public class Intent implements Parcelable { @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) public static final String ACTION_POWER_USAGE_SUMMARY = "android.intent.action.POWER_USAGE_SUMMARY"; + /** + * Activity Action: Setup wizard to launch after a platform update. This + * activity should have a string meta-data field associated with it, + * {@link #METADATA_SETUP_VERSION}, which defines the current version of + * the platform for setup. The activity will be launched only if + * {@link android.provider.Settings.Secure#LAST_SETUP_SHOWN} is not the + * same value. + * <p>Input: Nothing. + * <p>Output: Nothing. + * @hide + */ + @SdkConstant(SdkConstantType.ACTIVITY_INTENT_ACTION) + public static final String ACTION_UPGRADE_SETUP = "android.intent.action.UPGRADE_SETUP"; + + /** + * A string associated with a {@link #ACTION_UPGRADE_SETUP} activity + * describing the last run version of the platform that was setup. + * @hide + */ + public static final String METADATA_SETUP_VERSION = "android.SETUP_VERSION"; + // --------------------------------------------------------------------- // --------------------------------------------------------------------- // Standard intent broadcast actions (see action variable). diff --git a/core/java/android/provider/Settings.java b/core/java/android/provider/Settings.java index 57d4c44..79f2697 100644 --- a/core/java/android/provider/Settings.java +++ b/core/java/android/provider/Settings.java @@ -2259,6 +2259,13 @@ public final class Settings { * @hide */ public static final String BACKUP_TRANSPORT = "backup_transport"; + + /** + * Version for which the setup wizard was last shown. Bumped for + * each release when there is new setup information to show. + * @hide + */ + public static final String LAST_SETUP_SHOWN = "last_setup_shown"; /** * Helper method for determining if a location provider is enabled. |