am ba9bf79d: Merge change 25911 into eclair

Merge commit 'ba9bf79d49f25577998ddac8bb7026ee52583810' into eclair-plus-aosp

* commit 'ba9bf79d49f25577998ddac8bb7026ee52583810':
  Unhide attributes textAppearanceSearchResultSubtitle and
This commit is contained in:
Mike LeBeau
2009-09-19 01:36:44 -07:00
committed by Android Git Automerger
3 changed files with 26 additions and 2 deletions

View File

@ -7841,6 +7841,28 @@
visibility="public"
>
</field>
<field name="textAppearanceSearchResultSubtitle"
type="int"
transient="false"
volatile="false"
value="16843424"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="textAppearanceSearchResultTitle"
type="int"
transient="false"
volatile="false"
value="16843425"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="textAppearanceSmall"
type="int"
transient="false"

View File

@ -102,9 +102,9 @@
<!-- Text color, typeface, size, and style for "small" inverse text. Defaults to secondary inverse text color. -->
<attr name="textAppearanceSmallInverse" format="reference" />
<!-- Text color, typeface, size, and style for system search result title. Defaults to primary inverse text color. @hide -->
<!-- Text color, typeface, size, and style for system search result title. Defaults to primary inverse text color. -->
<attr name="textAppearanceSearchResultTitle" format="reference" />
<!-- Text color, typeface, size, and style for system search result subtitle. Defaults to primary inverse text color. @hide -->
<!-- Text color, typeface, size, and style for system search result subtitle. Defaults to primary inverse text color. -->
<attr name="textAppearanceSearchResultSubtitle" format="reference" />

View File

@ -1164,6 +1164,8 @@
<public type="attr" name="restoreNeedsApplication" />
<public type="attr" name="smallIcon" />
<public type="attr" name="accountPreferences" />
<public type="attr" name="textAppearanceSearchResultSubtitle" />
<public type="attr" name="textAppearanceSearchResultTitle" />
<public type="style" name="Theme.Wallpaper" />
<public type="style" name="Theme.Wallpaper.NoTitleBar" />