diff options
author | Scott Main <smain@google.com> | 2012-02-01 12:01:32 -0800 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2012-02-01 12:01:32 -0800 |
commit | b8f2c3514e2f30247d5a4e0e38c825ec0a0ced6f (patch) | |
tree | e0b88e58398a5fbc5056a4c42ae52009a6adb9c2 /docs | |
parent | fcaf0ff7be23df9f70dee014472292241c93c4e0 (diff) | |
parent | d3747509f5d3c64f1fbc6255a6f7f20aac023ead (diff) | |
download | frameworks_base-b8f2c3514e2f30247d5a4e0e38c825ec0a0ced6f.zip frameworks_base-b8f2c3514e2f30247d5a4e0e38c825ec0a0ced6f.tar.gz frameworks_base-b8f2c3514e2f30247d5a4e0e38c825ec0a0ced6f.tar.bz2 |
am d3747509: am 8f6b4c52: am 6b3f98b4: Merge "docs: fix action bar style example" into ics-mr1
* commit 'd3747509f5d3c64f1fbc6255a6f7f20aac023ead':
docs: fix action bar style example
Diffstat (limited to 'docs')
-rw-r--r-- | docs/html/guide/topics/ui/actionbar.jd | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docs/html/guide/topics/ui/actionbar.jd b/docs/html/guide/topics/ui/actionbar.jd index b35bc5f..e59fa0f 100644 --- a/docs/html/guide/topics/ui/actionbar.jd +++ b/docs/html/guide/topics/ui/actionbar.jd @@ -1427,7 +1427,7 @@ href="#ActionView">action views</a>. (Added in API level 14.)</dd> </style> <!-- style for the action bar tab text --> - <style name="CustomTabTextStyle"> + <style name="CustomTabTextStyle" parent="@android:style/TextAppearance.Holo"> <item name="android:textColor">#2456c2</item> </style> </resources> @@ -1443,8 +1443,7 @@ action bar styles you want to change without re-implementing the styles you want manifest file like this:</p> <pre> -<application android:theme="@style/CustomActivityTheme" - ... /> +<application android:theme="@style/CustomActivityTheme" ... /> </pre> <p>For more information about using style and theme resources in your application, read <a @@ -1463,7 +1462,7 @@ android:backgroundStacked}. If you override these action bar styles, be sure tha parent action bar style such as {@link android.R.style#Widget_Holo_ActionBar Widget.Holo.ActionBar}.</p> -<p>For example, if you want to change the action bar's background, you could use the following +<p>For example, if you want to change the action bar's background, you can use the following styles:</p> <pre> @@ -1471,14 +1470,15 @@ styles:</p> <resources> <!-- the theme applied to the application or activity --> <style name="CustomActivityTheme" parent="@android:style/Theme.Holo"> - <item name="android:actionBarTabTextStyle">@style/customTabTextStyle</item> + <item name="android:actionBarStyle">@style/MyActionBar</item> <!-- other activity and action bar styles here --> </style> - <!-- style for the action bar, simply to change the background --> - <style parent="@android:style/Widget.Holo.ActionBar"> + <!-- style for the action bar backgrounds --> + <style name="MyActionBar" parent="@android:style/Widget.Holo.ActionBar"> <item name="android:background">@drawable/ab_background</item> - <item name="android:backgroundSplit">@drawable/ab_background</item> + <item name="android:backgroundStacked">@drawable/ab_background</item> + <item name="android:backgroundSplit">@drawable/ab_split_background</item> </style> </resources> </pre> |