diff options
| author | 2009-09-20 23:23:25 -0400 | |
|---|---|---|
| committer | 2009-09-20 23:23:25 -0400 | |
| commit | ca4882322f25c95786383df18f843bc688e03351 (patch) | |
| tree | 97fc61d7acd6133deac33fc17f165579a295ca10 | |
| parent | e705ca961f6c4f76f5b403d8556ee38305553aa7 (diff) | |
| parent | 894bedacc491794563537bea79c8fcf5cfe469cf (diff) | |
Merge change 26104 into eclair
* changes:
Unhide themes TextAppearance.SearchResult.Title and TextAppearance.SearchResult.Subtitle. We had discussed doing this in Donut but looks like it never happened. We need these attributes for voice search so now's as good a time as any.
| -rw-r--r-- | core/res/res/values/public.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/themes.xml | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 71c6ff557dce..89581e6f5480 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1172,6 +1172,8 @@ <public type="style" name="Theme.Wallpaper.NoTitleBar.Fullscreen" /> <public type="style" name="Theme.WallpaperSettings" /> <public type="style" name="Theme.Light.WallpaperSettings" /> + <public type="style" name="TextAppearance.SearchResult.Title" /> + <public type="style" name="TextAppearance.SearchResult.Subtitle" /> <!-- Semi-transparent background that can be used when placing a dark themed UI on top of some arbitrary background (such as the diff --git a/core/res/res/values/themes.xml b/core/res/res/values/themes.xml index 04402fd9204e..b29e57179ea9 100644 --- a/core/res/res/values/themes.xml +++ b/core/res/res/values/themes.xml @@ -59,11 +59,7 @@ <item name="textAppearanceLargeInverse">@android:style/TextAppearance.Large.Inverse</item> <item name="textAppearanceMediumInverse">@android:style/TextAppearance.Medium.Inverse</item> <item name="textAppearanceSmallInverse">@android:style/TextAppearance.Small.Inverse</item> - - <!-- @hide --> <item name="textAppearanceSearchResultTitle">@android:style/TextAppearance.SearchResult.Title</item> - - <!-- @hide --> <item name="textAppearanceSearchResultSubtitle">@android:style/TextAppearance.SearchResult.Subtitle</item> <item name="textAppearanceButton">@android:style/TextAppearance.Widget.Button</item> |