summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-02-01 11:54:57 -0800
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-02-01 11:54:57 -0800
commit6b3f98b458b9dc7771cce37221d4fe8c4a19bf05 (patch)
treef910d5701835b529739254ec972b7dc793c78693 /docs
parentf47f6791f897b436530557dea3a57a2ca969afe6 (diff)
parentb6802e7b584f276e33c86bc7275c77edb137599c (diff)
downloadframeworks_base-6b3f98b458b9dc7771cce37221d4fe8c4a19bf05.zip
frameworks_base-6b3f98b458b9dc7771cce37221d4fe8c4a19bf05.tar.gz
frameworks_base-6b3f98b458b9dc7771cce37221d4fe8c4a19bf05.tar.bz2
Merge "docs: fix action bar style example" into ics-mr1
Diffstat (limited to 'docs')
-rw-r--r--docs/html/guide/topics/ui/actionbar.jd16
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>
&lt;/style>
&lt;!-- style for the action bar tab text -->
- &lt;style name="CustomTabTextStyle">
+ &lt;style name="CustomTabTextStyle" parent="@android:style/TextAppearance.Holo">
&lt;item name="android:textColor">#2456c2&lt;/item>
&lt;/style>
&lt;/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>
-&lt;application android:theme="&#64;style/CustomActivityTheme"
- ... />
+&lt;application android:theme="&#64;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>
&lt;resources>
&lt;!-- the theme applied to the application or activity -->
&lt;style name="CustomActivityTheme" parent="@android:style/Theme.Holo">
-   &lt;item name="android:actionBarTabTextStyle">@style/customTabTextStyle&lt;/item>
+ &lt;item name="android:actionBarStyle">@style/MyActionBar&lt;/item>
&lt;!-- other activity and action bar styles here -->
&lt;/style>
- &lt;!-- style for the action bar, simply to change the background -->
- &lt;style parent="@android:style/Widget.Holo.ActionBar">
+ &lt;!-- style for the action bar backgrounds -->
+ &lt;style name="MyActionBar" parent="@android:style/Widget.Holo.ActionBar">
&lt;item name="android:background">@drawable/ab_background&lt;/item>
- &lt;item name="android:backgroundSplit">@drawable/ab_background&lt;/item>
+ &lt;item name="android:backgroundStacked">@drawable/ab_background&lt;/item>
+ &lt;item name="android:backgroundSplit">@drawable/ab_split_background&lt;/item>
&lt;/style>
&lt;/resources>
</pre>