diff options
author | Ricardo Cervera <rcervera@google.com> | 2014-04-04 17:29:00 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-04 17:29:00 +0000 |
commit | a821af684e2a5f814fc8709518b5f0589c81661e (patch) | |
tree | 38b38e6075d8ab87859fa37058a81709dced90f0 /docs/html | |
parent | e2bdd6ae33640430fc4a0d58c263d5af94fdee77 (diff) | |
parent | 715139a620383c89e061a2b0650e184bf3382a10 (diff) | |
download | frameworks_base-a821af684e2a5f814fc8709518b5f0589c81661e.zip frameworks_base-a821af684e2a5f814fc8709518b5f0589c81661e.tar.gz frameworks_base-a821af684e2a5f814fc8709518b5f0589c81661e.tar.bz2 |
am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs
* commit '715139a620383c89e061a2b0650e184bf3382a10':
docs: Fixed action bar example. Bug: 13806963
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> |