diff options
| author | Ricardo Cervera <rcervera@google.com> | 2014-04-04 17:46:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-04 17:46:28 +0000 |
| commit | d09e5606a54640fca9a2451b898ae4cc3f5440b9 (patch) | |
| tree | 4762a1fb67c8ca4c46bdde4ef342b47206d8e42a /docs/html | |
| parent | b7341e222d63da948153166523190c3eb5e1ca9c (diff) | |
| parent | 1ac6519b245c008ea6b3b6baba205fb58d75c807 (diff) | |
| download | frameworks_base-d09e5606a54640fca9a2451b898ae4cc3f5440b9.zip frameworks_base-d09e5606a54640fca9a2451b898ae4cc3f5440b9.tar.gz frameworks_base-d09e5606a54640fca9a2451b898ae4cc3f5440b9.tar.bz2 | |
am 1ac6519b: am c31bd52d: am a821af68: am 715139a6: Merge "docs: Fixed action bar example. Bug: 13806963" into klp-docs
* commit '1ac6519b245c008ea6b3b6baba205fb58d75c807':
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> |