Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3d595e1 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 108fd1c0: Merge change 6435 into donut 

Merge commit '108fd1c0'

* commit '108fd1c0':
  Add new textColorPrimaryInverseDisableOnly color to resources.
parents 797c3909 108fd1c0

api/current.xml

+11 −11
Original line number Diff line number Diff line
@@ -3474,17 +3474,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"
@@ -8490,6 +8479,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"

core/res/res/values/attrs.xml

+3 −0
Original line number Diff line number Diff line
@@ -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. -->

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />

core/res/res/values/themes.xml

+2 −0
Original line number Diff line number Diff line
@@ -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>