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.
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 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 @@
* <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;