summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorRicardo Cervera <rcervera@google.com>2014-04-04 17:23:08 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-04-04 17:23:09 +0000
commit715139a620383c89e061a2b0650e184bf3382a10 (patch)
tree6c9f848207268d1844c297402e3151a397b6b402 /docs/html
parent6ae21ea7fb37c76429a48a41987c9c0e2c067c31 (diff)
parent7f427b45bded3f3057b72175912b4a8be736da39 (diff)
downloadframeworks_base-715139a620383c89e061a2b0650e184bf3382a10.zip
frameworks_base-715139a620383c89e061a2b0650e184bf3382a10.tar.gz
frameworks_base-715139a620383c89e061a2b0650e184bf3382a10.tar.bz2
Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs
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>