diff options
author | Ricardo Cervera <rcervera@google.com> | 2014-04-04 17:23:08 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-04 17:23:09 +0000 |
commit | 715139a620383c89e061a2b0650e184bf3382a10 (patch) | |
tree | 6c9f848207268d1844c297402e3151a397b6b402 /docs/html | |
parent | 6ae21ea7fb37c76429a48a41987c9c0e2c067c31 (diff) | |
parent | 7f427b45bded3f3057b72175912b4a8be736da39 (diff) | |
download | frameworks_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.jd | 4 |
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> <resources> <!-- the theme applied to the application or activity --> <style name="CustomActionBarTheme" - parent="@style/Theme.Holo.Light.DarkActionBar"> + parent="@android:style/Theme.Holo.Light.DarkActionBar"> <item name="android:actionBarStyle">@style/MyActionBar</item> </style> <!-- ActionBar styles --> <style name="MyActionBar" - parent="@style/Widget.Holo.Light.ActionBar.Solid.Inverse"> + parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse"> <item name="android:background">@drawable/actionbar_background</item> </style> </resources> |