diff --git a/api/current.xml b/api/current.xml index 54ba4a333f81e..7c38aacc0d093 100644 --- a/api/current.xml +++ b/api/current.xml @@ -16663,7 +16663,7 @@ visibility="public" > - - - -= android.os.Build.VERSION_CODES.HONEYCOMB) { + // As of honeycomb, the default application theme is holographic. + defaultTheme = android.R.style.Theme_Holo; + } + ai.icon = sa.getResourceId( com.android.internal.R.styleable.AndroidManifestApplication_icon, 0); ai.logo = sa.getResourceId( com.android.internal.R.styleable.AndroidManifestApplication_logo, 0); ai.theme = sa.getResourceId( - com.android.internal.R.styleable.AndroidManifestApplication_theme, 0); + com.android.internal.R.styleable.AndroidManifestApplication_theme, defaultTheme); ai.descriptionRes = sa.getResourceId( com.android.internal.R.styleable.AndroidManifestApplication_description, 0); diff --git a/core/java/android/os/Build.java b/core/java/android/os/Build.java index 8624467755a1f..9268cd17f0900 100644 --- a/core/java/android/os/Build.java +++ b/core/java/android/os/Build.java @@ -206,7 +206,8 @@ public class Build { *

Applications targeting this or a later release will get these * new changes in behavior:

* */ public static final int HONEYCOMB = CUR_DEVELOPMENT; diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index ea5c1586d7846..a3367e383649c 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1347,18 +1347,12 @@ the base class. --> - - - - - - - - - - + + + + diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index c78705b415c3b..9f6c1ea73463f 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -575,35 +575,48 @@ true - + - + - - - - - - - -