summaryrefslogtreecommitdiffstats
path: root/core/res
diff options
context:
space:
mode:
authorAdam Powell <adamp@google.com>2010-10-29 18:15:13 -0700
committerAdam Powell <adamp@google.com>2010-10-29 18:35:31 -0700
commit0db3ff0bda4f919bdde8bab253d47a186f945598 (patch)
tree1990b39cf7f6615a5d59761de78dec4468cbea5a /core/res
parent7f3154d7fa638958cf8e90af3ccfdf5d2f869777 (diff)
downloadframeworks_base-0db3ff0bda4f919bdde8bab253d47a186f945598.zip
frameworks_base-0db3ff0bda4f919bdde8bab253d47a186f945598.tar.gz
frameworks_base-0db3ff0bda4f919bdde8bab253d47a186f945598.tar.bz2
Remove default background from Holo; add Holo.Extended themes
Change-Id: Ie3143230ebb827eb3625ffe40ee4fc24853ab9dc
Diffstat (limited to 'core/res')
-rw-r--r--core/res/res/values/public.xml2
-rw-r--r--core/res/res/values/themes.xml22
2 files changed, 20 insertions, 4 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index d704366..f905725 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -1402,6 +1402,8 @@
<public type="style" name="Theme.Holo.Light" />
<public type="style" name="Theme.Holo.Dialog" />
<public type="style" name="Theme.Holo.Light.Dialog" />
+ <public type="style" name="Theme.Holo.Extended" />
+ <public type="style" name="Theme.Holo.Light.Extended" />
<public type="style" name="Widget.ListPopupWindow" />
<public type="style" name="Widget.PopupMenu" />
diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml
index eeefa9e..077ce26 100644
--- a/core/res/res/values/themes.xml
+++ b/core/res/res/values/themes.xml
@@ -641,7 +641,7 @@
<item name="colorForeground">@android:color/bright_foreground_holo_dark</item>
<item name="colorForegroundInverse">@android:color/bright_foreground_inverse_holo_dark</item>
<item name="colorBackground">@android:color/background_holo_dark</item>
- <item name="colorBackgroundCacheHint">@android:color/transparent</item>
+ <item name="colorBackgroundCacheHint">?android:attr/colorBackground</item>
<item name="disabledAlpha">0.5</item>
<item name="backgroundDimAmount">0.6</item>
@@ -734,7 +734,7 @@
<item name="galleryItemBackground">@android:drawable/gallery_item_background</item>
<!-- Window attributes -->
- <item name="windowBackground">@android:drawable/background_holo_dark</item>
+ <item name="windowBackground">?android:attr/colorBackground</item>
<item name="windowFrame">@null</item>
<item name="windowNoTitle">false</item>
<item name="windowFullscreen">false</item>
@@ -875,7 +875,7 @@
<item name="colorForeground">@android:color/bright_foreground_holo_light</item>
<item name="colorForegroundInverse">@android:color/bright_foreground_inverse_holo_light</item>
<item name="colorBackground">@android:color/background_holo_light</item>
- <item name="colorBackgroundCacheHint">@android:color/transparent</item>
+ <item name="colorBackgroundCacheHint">?android:attr/colorBackground</item>
<item name="disabledAlpha">0.5</item>
<item name="backgroundDimAmount">0.6</item>
@@ -968,7 +968,7 @@
<item name="galleryItemBackground">@android:drawable/gallery_item_background</item>
<!-- Window attributes -->
- <item name="windowBackground">@android:drawable/background_holo_light</item>
+ <item name="windowBackground">?android:attr/colorBackground</item>
<item name="windowFrame">@null</item>
<item name="windowNoTitle">false</item>
<item name="windowFullscreen">false</item>
@@ -1129,6 +1129,20 @@
<item name="android:windowFullscreen">true</item>
<item name="android:windowContentOverlay">@null</item>
</style>
+
+ <!-- Variant of the holographic dark theme that includes extra decorations
+ appropriate for when hardware acceleration is in use. -->
+ <style name="Theme.Holo.Extended">
+ <item name="windowBackground">@android:drawable/background_holo_dark</item>
+ <item name="colorBackgroundCacheHint">@android:color/transparent</item>
+ </style>
+
+ <!-- Variant of the holographic light theme that includes extra decorations
+ appropriate for when hardware acceleration is in use. -->
+ <style name="Theme.Holo.Light.Extended">
+ <item name="windowBackground">@android:drawable/background_holo_light</item>
+ <item name="colorBackgroundCacheHint">@android:color/transparent</item>
+ </style>
<!-- Dialog themes for Holo -->