diff options
| author | Adam Powell <adamp@google.com> | 2011-07-07 14:35:22 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-07 14:35:22 -0700 |
| commit | eea5be5447c759fcc11e587504ae172a4665db78 (patch) | |
| tree | b05a2faf74dcfabfe571c6b2c1bfb6fc1104a950 /core/res | |
| parent | cb925e7a563d06dde5273b73033822a3bae0d4db (diff) | |
| parent | 160bb7fa60e8ece654e6ce999b6c16af50ee7357 (diff) | |
| download | frameworks_base-eea5be5447c759fcc11e587504ae172a4665db78.zip frameworks_base-eea5be5447c759fcc11e587504ae172a4665db78.tar.gz frameworks_base-eea5be5447c759fcc11e587504ae172a4665db78.tar.bz2 | |
Merge "Action bar layout tweaks"
Diffstat (limited to 'core/res')
| -rw-r--r-- | core/res/res/values/public.xml | 1 | ||||
| -rw-r--r-- | core/res/res/values/styles.xml | 12 | ||||
| -rw-r--r-- | core/res/res/values/themes.xml | 3 |
3 files changed, 12 insertions, 4 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 737176d..2de9cd3 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1789,6 +1789,7 @@ <public type="style" name="TextAppearance.Holo.Widget.ActionBar.Subtitle.Inverse" /> <public type="style" name="TextAppearance.Holo.Widget.ActionMode.Title.Inverse" /> <public type="style" name="TextAppearance.Holo.Widget.ActionMode.Subtitle.Inverse" /> + <public type="style" name="TextAppearance.Holo.Widget.ActionBar.Menu" /> <public type="style" name="Widget.Holo.ActionBar.Solid" /> <public type="style" name="Widget.Holo.Light.ActionBar.Solid" /> <public type="style" name="Widget.Holo.Light.ActionBar.Solid.Inverse" /> diff --git a/core/res/res/values/styles.xml b/core/res/res/values/styles.xml index 9ee4b6a..11016f4 100644 --- a/core/res/res/values/styles.xml +++ b/core/res/res/values/styles.xml @@ -1314,6 +1314,13 @@ <item name="android:textSize">@android:dimen/action_bar_subtitle_text_size</item> </style> + <style name="TextAppearance.Holo.Widget.ActionBar.Menu" + parent="TextAppearance.Holo.Small"> + <item name="android:textSize">12sp</item> + <item name="android:textStyle">bold</item> + <item name="android:textColor">?android:attr/actionMenuTextColor</item> + </style> + <style name="TextAppearance.Holo.Widget.ActionMode"> </style> @@ -1848,7 +1855,8 @@ <style name="Widget.Holo.ActionBar.TabText" parent="Widget.ActionBar.TabText"> <item name="android:textAppearance">@style/TextAppearance.Holo.Medium</item> <item name="android:textColor">?android:attr/textColorPrimary</item> - <item name="android:textSize">18sp</item> + <item name="android:textSize">12sp</item> + <item name="android:textStyle">bold</item> </style> <style name="Widget.Holo.ActionMode" parent="Widget.ActionMode"> @@ -2203,9 +2211,7 @@ </style> <style name="Widget.Holo.Light.ActionBar.TabText.Inverse"> - <item name="android:textAppearance">@style/TextAppearance.Holo.Medium</item> <item name="android:textColor">?android:attr/textColorPrimaryInverse</item> - <item name="android:textSize">18sp</item> </style> <style name="Widget.Holo.Light.ActionMode" parent="Widget.Holo.ActionMode"> diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 23111e6..9a52cff 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -283,7 +283,7 @@ <item name="actionBarSplitStyle">?android:attr/actionBarStyle</item> <item name="actionBarSize">@dimen/action_bar_default_height</item> <item name="actionModePopupWindowStyle">?android:attr/popupWindowStyle</item> - <item name="actionMenuTextAppearance">?android:attr/textAppearanceSmall</item> + <item name="actionMenuTextAppearance">@android:style/TextAppearance.Holo.Widget.ActionBar.Menu</item> <item name="actionMenuTextColor">?android:attr/textColorPrimary</item> <item name="dividerVertical">@drawable/divider_vertical_dark</item> @@ -1389,6 +1389,7 @@ <item name="actionOverflowButtonStyle">@android:style/Widget.Holo.ActionButton.Overflow</item> <item name="actionModeBackground">@android:drawable/cab_background_holo_dark</item> <item name="actionModeCloseDrawable">@android:drawable/cab_ic_close_holo</item> + <item name="homeAsUpIndicator">@android:drawable/ic_ab_back_holo_dark</item> <item name="actionBarTabStyle">@style/Widget.Holo.Light.ActionBar.TabView.Inverse</item> <item name="actionBarTabBarStyle">@style/Widget.Holo.Light.ActionBar.TabBar.Inverse</item> <item name="actionBarTabTextStyle">@style/Widget.Holo.Light.ActionBar.TabText.Inverse</item> |