diff options
| author | Dianne Hackborn <hackbod@google.com> | 2010-03-01 17:43:39 -0800 |
|---|---|---|
| committer | Dianne Hackborn <hackbod@google.com> | 2010-03-01 20:42:14 -0800 |
| commit | ef05e076ced1a32c5c0aaee28403779834adb2ba (patch) | |
| tree | 20dcf607adf508481d57610937ceab6ef2c6aee2 /core | |
| parent | 883dbacb12a003f8f46c3faab26b744fdef649a1 (diff) | |
| download | frameworks_base-ef05e076ced1a32c5c0aaee28403779834adb2ba.zip frameworks_base-ef05e076ced1a32c5c0aaee28403779834adb2ba.tar.gz frameworks_base-ef05e076ced1a32c5c0aaee28403779834adb2ba.tar.bz2 | |
Fix issue #2448075: aapt doesn't fix up activity-alias android:targetActivity links
And related:
- The aapt tool now sets a resource configurations sdk level to match any configs
that have been set (for example if you specify density your sdk level will be
at least 4).
- New option to modify the targetPackage attribute of instrumentation.
- Clean up of aapt options help.
- Fix of UI type values to leave 0 for "unspecified".
- Make the UI mode config APIs public.
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/content/pm/ActivityInfo.java | 1 | ||||
| -rw-r--r-- | core/java/android/content/res/Configuration.java | 14 |
2 files changed, 3 insertions, 12 deletions
diff --git a/core/java/android/content/pm/ActivityInfo.java b/core/java/android/content/pm/ActivityInfo.java index a13f7f9..91b2be7 100644 --- a/core/java/android/content/pm/ActivityInfo.java +++ b/core/java/android/content/pm/ActivityInfo.java @@ -253,7 +253,6 @@ public class ActivityInfo extends ComponentInfo * Bit in {@link #configChanges} that indicates that the activity * can itself handle the ui mode. Set from the * {@link android.R.attr#configChanges} attribute. - * @hide (UIMODE) Pending API council approval */ public static final int CONFIG_UI_MODE = 0x0200; /** diff --git a/core/java/android/content/res/Configuration.java b/core/java/android/content/res/Configuration.java index 6490b65..a737283 100644 --- a/core/java/android/content/res/Configuration.java +++ b/core/java/android/content/res/Configuration.java @@ -162,20 +162,14 @@ public final class Configuration implements Parcelable, Comparable<Configuration */ public int orientation; - /** @hide (UIMODE) Pending API council approval */ public static final int UI_MODE_TYPE_MASK = 0x0f; - /** @hide (UIMODE) Pending API council approval */ - public static final int UI_MODE_TYPE_NORMAL = 0x00; - /** @hide (UIMODE) Pending API council approval */ - public static final int UI_MODE_TYPE_CAR = 0x01; + public static final int UI_MODE_TYPE_UNDEFINED = 0x00; + public static final int UI_MODE_TYPE_NORMAL = 0x01; + public static final int UI_MODE_TYPE_CAR = 0x02; - /** @hide (UIMODE) Pending API council approval */ public static final int UI_MODE_NIGHT_MASK = 0x30; - /** @hide (UIMODE) Pending API council approval */ public static final int UI_MODE_NIGHT_UNDEFINED = 0x00; - /** @hide (UIMODE) Pending API council approval */ public static final int UI_MODE_NIGHT_NO = 0x10; - /** @hide (UIMODE) Pending API council approval */ public static final int UI_MODE_NIGHT_YES = 0x20; /** @@ -187,8 +181,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration * <p>The {@link #UI_MODE_NIGHT_MASK} defines whether the screen * is in a special mode. They may be one of * {@link #UI_MODE_NIGHT_NO} or {@link #UI_MODE_NIGHT_YES}. - * - * @hide (UIMODE) Pending API council approval */ public int uiMode; |