Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Make Theme.Holo the default theme for new apps.

Browse Source 
Also change Holo to have an action bar, instead of a title bar.

Change-Id: I45c2f06938509ae02cde99d1c06c228f86e8e3e8
This commit is contained in:
Dianne Hackborn
2010-08-23 18:30:44 -07:00
parent 208e3c586d
commit 3e6d50cc48
5 changed files with 40 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
api/current.xml
View File

@@ -16663,7 +16663,7 @@
visibility="public"
>
</field>
<field name="Theme_Holo_NoTitleBar"
<field name="Theme_Holo_NoActionBar"
type="int"
transient="false"
volatile="false"
@@ -16674,7 +16674,7 @@
visibility="public"
>
</field>
<field name="Theme_Holo_NoTitleBar_Fullscreen"
<field name="Theme_Holo_NoActionBar_Fullscreen"
type="int"
transient="false"
volatile="false"
@@ -16718,7 +16718,7 @@
visibility="public"
>
</field>
<field name="Theme_Light_Holo_NoTitleBar"
<field name="Theme_Light_Holo_NoActionBar"
type="int"
transient="false"
volatile="false"
@@ -16729,7 +16729,7 @@
visibility="public"
>
</field>
<field name="Theme_Light_Holo_NoTitleBar_Fullscreen"
<field name="Theme_Light_Holo_NoActionBar_Fullscreen"
type="int"
transient="false"
volatile="false"

8
core/java/android/content/pm/PackageParser.java
View File

@@ -1494,12 +1494,18 @@ public class PackageParser {
ai.nonLocalizedLabel = v.coerceToString();
}
int defaultTheme = 0;
if (owner.applicationInfo.targetSdkVersion >= 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);

3
core/java/android/os/Build.java
View File

@@ -206,7 +206,8 @@ public class Build {
* <p>Applications targeting this or a later release will get these
* new changes in behavior:</p>
* <ul>
* <li> Alerts UI change?
* <li> The default theme for applications is now dark holographic:
* {@link android.R.style#Theme_Holo}.
* </ul>
*/
public static final int HONEYCOMB = CUR_DEVELOPMENT;

14
core/res/res/values/public.xml
View File

@@ -1347,18 +1347,12 @@
the base class. -->
<public type="layout" name="list_content" />
<!-- A dark holographic theme. -->
<public type="style" name="Theme.Holo" />
<!-- A light holographic theme. -->
<public type="style" name="Theme.Light.Holo" />
<!-- Variant of the holographic (dark) theme with no title bar -->
<public type="style" name="Theme.Holo.NoTitleBar" />
<!-- Variant of the holographic (dark) theme that has no title bar and fills the entire screen -->
<public type="style" name="Theme.Holo.NoTitleBar.Fullscreen" />
<!-- Variant of the holographic light theme with no title bar -->
<public type="style" name="Theme.Light.Holo.NoTitleBar" />
<!-- Variant of the holographic light theme that has no title bar and fills the entire screen -->
<public type="style" name="Theme.Light.Holo.NoTitleBar.Fullscreen" />
<public type="style" name="Theme.Holo.NoActionBar" />
<public type="style" name="Theme.Holo.NoActionBar.Fullscreen" />
<public type="style" name="Theme.Light.Holo.NoActionBar" />
<public type="style" name="Theme.Light.Holo.NoActionBar.Fullscreen" />
<public type="string" name="selectTextMode" id="0x01040030" />
</resources>

33
core/res/res/values/themes.xml
View File

@@ -575,35 +575,48 @@
<item name="android:windowActionModeOverlay">true</item>
</style>
<!-- New Honeycomb holographic theme. Dark version -->
<!-- New Honeycomb holographic theme. Dark version. The widgets in the
holographic theme are translucent on their brackground, so applications
must ensure that any background they use with this theme is itself
dark; otherwise, it will be difficult to see the widgets. The new
UI style also includes a full action bar by default. -->
<style name="Theme.Holo">
<item name="editTextBackground">@android:drawable/edit_text_holo_dark</item>
<item name="editTextColor">?android:attr/textColorPrimary</item>
<item name="android:windowActionBar">true</item>
</style>
<!-- New Honeycomb holographic theme. Light version -->
<!-- New Honeycomb holographic theme. Light version. The widgets in the
holographic theme are translucent on their brackground, so applications
must ensure that any background they use with this theme is itself
light; otherwise, it will be difficult to see the widgets. The new
UI style also includes a full action bar by default. -->
<style name="Theme.Light.Holo">
<item name="editTextBackground">@android:drawable/edit_text_holo_light</item>
</style>
<!-- Variant of the holo (dark) theme with no title bar -->
<style name="Theme.Holo.NoTitleBar">
<!-- Variant of the holographic (dark) theme with no action bar. -->
<style name="Theme.Holo.NoActionBar">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
</style>
<!-- Variant of the holo (dark) theme that has no title bar and fills the entire screen -->
<style name="Theme.Holo.NoTitleBar.Fullscreen">
<!-- Variant of the holographic (dark) theme that has no title bar and fills
the entire screen -->
<style name="Theme.Holo.NoActionBar.Fullscreen">
<item name="android:windowFullscreen">true</item>
<item name="android:windowContentOverlay">@null</item>
</style>
<!-- Variant of the holo light theme with no title bar -->
<style name="Theme.Light.Holo.NoTitleBar">
<!-- Variant of the holographic light theme with no action bar -->
<style name="Theme.Light.Holo.NoActionBar">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>
</style>
<!-- Variant of the holo light theme that has no title bar and fills the entire screen -->
<style name="Theme.Light.Holo.NoTitleBar.Fullscreen">
<!-- Variant of the holographic light theme that has no title bar and fills
the entire screen -->
<style name="Theme.Light.Holo.NoActionBar.Fullscreen">
<item name="android:windowFullscreen">true</item>
<item name="android:windowContentOverlay">@null</item>
</style>