summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-04-04 17:32:42 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-04-04 17:32:42 +0000
commitc31bd52df22dabf52b50e1377878548607d1f07b (patch)
tree3d221da7ce4fcd75ad1c84ddc4e360c3f02df67a /docs/html
parent13d49e9f364965169f933bcad6bcaeeb2f29fade (diff)
parenta821af684e2a5f814fc8709518b5f0589c81661e (diff)
downloadframeworks_base-c31bd52df22dabf52b50e1377878548607d1f07b.zip
frameworks_base-c31bd52df22dabf52b50e1377878548607d1f07b.tar.gz
frameworks_base-c31bd52df22dabf52b50e1377878548607d1f07b.tar.bz2
am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs
* commit 'a821af684e2a5f814fc8709518b5f0589c81661e': docs: Fixed action bar example. Bug: 13806963
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/training/basics/actionbar/styling.jd4
1 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/training/basics/actionbar/styling.jd b/docs/html/training/basics/actionbar/styling.jd
index 1f76e03..4128a97 100644
--- a/docs/html/training/basics/actionbar/styling.jd
+++ b/docs/html/training/basics/actionbar/styling.jd
@@ -144,13 +144,13 @@ background like this:</p>
&lt;resources>
&lt;!-- the theme applied to the application or activity -->
&lt;style name="CustomActionBarTheme"
- parent="&#64;style/Theme.Holo.Light.DarkActionBar">
+ parent="&#64;android:style/Theme.Holo.Light.DarkActionBar">
&lt;item name="android:actionBarStyle">&#64;style/MyActionBar&lt;/item>
&lt;/style>
&lt;!-- ActionBar styles -->
&lt;style name="MyActionBar"
- parent="&#64;style/Widget.Holo.Light.ActionBar.Solid.Inverse">
+ parent="&#64;android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
&lt;item name="android:background">&#64;drawable/actionbar_background&lt;/item>
&lt;/style>
&lt;/resources>