Merge change 6435 into donut

* changes:
  Add new textColorPrimaryInverseDisableOnly color to resources.
This commit is contained in:
Android (Google) Code Review
2009-07-07 17:49:13 -07:00
4 changed files with 17 additions and 11 deletions

View File

@@ -3397,17 +3397,6 @@
visibility="public"
>
</field>
<field name="donut_resource_pad21"
type="int"
transient="false"
volatile="false"
value="16843403"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="donut_resource_pad3"
type="int"
transient="false"
@@ -8413,6 +8402,17 @@
visibility="public"
>
</field>
<field name="textColorPrimaryInverseDisableOnly"
type="int"
transient="false"
volatile="false"
value="16843403"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="textColorPrimaryInverseNoDisable"
type="int"
transient="false"

View File

@@ -68,6 +68,9 @@
<!-- Bright text color. Only differentiates based on the disabled state. -->
<attr name="textColorPrimaryDisableOnly" format="reference|color" />
<!-- Bright inverse text color. Only differentiates based on the disabled state. -->
<attr name="textColorPrimaryInverseDisableOnly" format="reference|color" />
<!-- Bright text color. This does not differentiate the disabled state. As an example,
buttons use this since they display the disabled state via the background and not the
foreground text color. -->

View File

@@ -1124,6 +1124,7 @@
<public type="attr" name="progressBarStyleSmallInverse" />
<public type="attr" name="progressBarStyleLargeInverse" />
<public type="attr" name="searchSettingsDescription" />
<public type="attr" name="textColorPrimaryInverseDisableOnly" />
<public-padding type="attr" name="donut_resource_pad" end="0x0101029f" />

View File

@@ -44,6 +44,7 @@
<item name="textColorSecondaryInverse">@android:color/secondary_text_light</item>
<item name="textColorTertiaryInverse">@android:color/tertiary_text_light</item>
<item name="textColorPrimaryDisableOnly">@android:color/primary_text_dark_disable_only</item>
<item name="textColorPrimaryInverseDisableOnly">@android:color/primary_text_light_disable_only</item>
<item name="textColorPrimaryNoDisable">@android:color/primary_text_dark_nodisable</item>
<item name="textColorSecondaryNoDisable">@android:color/secondary_text_dark_nodisable</item>
<item name="textColorPrimaryInverseNoDisable">@android:color/primary_text_light_nodisable</item>
@@ -220,6 +221,7 @@
<item name="textColorSecondaryInverse">@android:color/secondary_text_dark</item>
<item name="textColorTertiaryInverse">@android:color/tertiary_text_dark</item>
<item name="textColorPrimaryDisableOnly">@android:color/primary_text_light_disable_only</item>
<item name="textColorPrimaryInverseDisableOnly">@android:color/primary_text_dark_disable_only</item>
<item name="textColorPrimaryNoDisable">@android:color/primary_text_light_nodisable</item>
<item name="textColorSecondaryNoDisable">@android:color/secondary_text_light_nodisable</item>
<item name="textColorPrimaryInverseNoDisable">@android:color/primary_text_dark_nodisable</item>