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

Commit dbd39fc6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Document expected colors, deprecate old ones" into pi-dev

parents 77fcc0da 9b48099a

api/current.txt

+10 −10
Original line number Diff line number Diff line
@@ -1605,17 +1605,17 @@ package android { 
    field public static final int holo_purple = 17170458; // 0x106001a

    field public static final int holo_red_dark = 17170455; // 0x1060017

    field public static final int holo_red_light = 17170454; // 0x1060016

    field public static final int primary_text_dark = 17170433; // 0x1060001

    field public static final int primary_text_dark_nodisable = 17170434; // 0x1060002

    field public static final int primary_text_light = 17170435; // 0x1060003

    field public static final int primary_text_light_nodisable = 17170436; // 0x1060004

    field public static final int secondary_text_dark = 17170437; // 0x1060005

    field public static final int secondary_text_dark_nodisable = 17170438; // 0x1060006

    field public static final int secondary_text_light = 17170439; // 0x1060007

    field public static final int secondary_text_light_nodisable = 17170440; // 0x1060008

    field public static final deprecated int primary_text_dark = 17170433; // 0x1060001

    field public static final deprecated int primary_text_dark_nodisable = 17170434; // 0x1060002

    field public static final deprecated int primary_text_light = 17170435; // 0x1060003

    field public static final deprecated int primary_text_light_nodisable = 17170436; // 0x1060004

    field public static final deprecated int secondary_text_dark = 17170437; // 0x1060005

    field public static final deprecated int secondary_text_dark_nodisable = 17170438; // 0x1060006

    field public static final deprecated int secondary_text_light = 17170439; // 0x1060007

    field public static final deprecated int secondary_text_light_nodisable = 17170440; // 0x1060008

    field public static final int tab_indicator_text = 17170441; // 0x1060009

    field public static final int tertiary_text_dark = 17170448; // 0x1060010

    field public static final int tertiary_text_light = 17170449; // 0x1060011

    field public static final deprecated int tertiary_text_dark = 17170448; // 0x1060010

    field public static final deprecated int tertiary_text_light = 17170449; // 0x1060011

    field public static final int transparent = 17170445; // 0x106000d

    field public static final int white = 17170443; // 0x106000b

    field public static final int widget_edittext_dark = 17170442; // 0x106000a

core/res/res/values/colors.xml

+6 −0
Original line number Diff line number Diff line
@@ -33,11 +33,16 @@ 
         a light UI more visible. -->

    <drawable name="screen_background_light_transparent">#80ffffff</drawable>

    <color name="safe_mode_text">#80ffffff</color>

    <!-- The color white, equivalent to 0xffffffff -->

    <color name="white">#ffffffff</color>

    <!-- The color black, equivalent to 0xff000000 -->

    <color name="black">#ff000000</color>

    <color name="red">#ffff0000</color>

    <!-- Fully transparent, equivalent to 0x00000000 -->

    <color name="transparent">#00000000</color>

    <!-- Equivalent to 0xff000000 -->

    <color name="background_dark">#ff000000</color>

    <!-- Equivalent to 0xffffffff -->

    <color name="background_light">#ffffffff</color>

    <color name="bright_foreground_dark">@android:color/background_light</color>

    <color name="bright_foreground_light">@android:color/background_dark</color>
@@ -80,6 +85,7 @@ 


    <!-- For settings framework -->

    <color name="lighter_gray">#ddd</color>

    <!-- A dark gray, equivalent to 0xffaaaaaa -->

    <color name="darker_gray">#aaa</color>



    <!-- For security permissions -->

core/res/res/values/colors_holo.xml

+12 −12
Original line number Diff line number Diff line
@@ -50,29 +50,29 @@ 
    <!-- General purpose colors for Holo-themed elements -->

    <eat-comment />



    <!-- A light Holo shade of blue -->

    <!-- A light Holo shade of blue. Equivalent to #ff33b5e5. -->

    <color name="holo_blue_light">#ff33b5e5</color>

    <!-- A light Holo shade of gray -->

    <!-- A light Holo shade of gray. Equivalent to #33999999. -->

    <color name="holo_gray_light">#33999999</color>

    <!-- A light Holo shade of green -->

    <!-- A light Holo shade of green. Equivalent to #ff99cc00. -->

    <color name="holo_green_light">#ff99cc00</color>

    <!-- A light Holo shade of red -->

    <!-- A light Holo shade of red. Equivalent to #ffff4444. <-->

    <color name="holo_red_light">#ffff4444</color>

    <!-- A dark Holo shade of blue -->

    <!-- A dark Holo shade of blue. Equivalent to #ff0099cc -->

    <color name="holo_blue_dark">#ff0099cc</color>

    <!-- A dark Holo shade of green -->

    <!-- A dark Holo shade of green. Equivalent to #ff669900 -->

    <color name="holo_green_dark">#ff669900</color>

    <!-- A dark Holo shade of red -->

    <!-- A dark Holo shade of red. Equivalent to #ffcc0000 -->

    <color name="holo_red_dark">#ffcc0000</color>

    <!-- A Holo shade of purple -->

    <!-- A Holo shade of purple. Equivalent to #ffaa66cc -->

    <color name="holo_purple">#ffaa66cc</color>

    <!-- A light Holo shade of orange -->

    <!-- A light Holo shade of orange. Equivalent to #ffffbb33. -->

    <color name="holo_orange_light">#ffffbb33</color>

    <!-- A dark Holo shade of orange -->

    <!-- A dark Holo shade of orange. Equivalent to ffff8800. -->

    <color name="holo_orange_dark">#ffff8800</color>

    <!-- A really bright Holo shade of blue -->

    <!-- A really bright Holo shade of blue. Equivalent to #ff00ddff. -->

    <color name="holo_blue_bright">#ff00ddff</color>

    <!-- A really bright Holo shade of gray -->

    <!-- A really bright Holo shade of gray. Equivalent to #33cccccc. -->

    <color name="holo_gray_bright">#33CCCCCC</color>



    <!-- Forward compatibility for Material-style theme colors -->

core/res/res/values/public.xml

+15 −0
Original line number Diff line number Diff line
@@ -708,23 +708,38 @@ 
  <public type="dimen" name="thumbnail_height" id="0x01050001" />

  <public type="dimen" name="thumbnail_width" id="0x01050002" />



  <!-- Equivalent to 0xffaaaaaa -->

  <public type="color" name="darker_gray" id="0x01060000" />

  <!-- {@deprecated Use a text color from your theme instead.} -->

  <public type="color" name="primary_text_dark" id="0x01060001" />

  <!-- {@deprecated Use a text color from your theme instead.} -->

  <public type="color" name="primary_text_dark_nodisable" id="0x01060002" />

  <!-- {@deprecated Use a text color from your theme instead.} -->

  <public type="color" name="primary_text_light" id="0x01060003" />

  <!-- {@deprecated Use a text color from your theme instead.} -->

  <public type="color" name="primary_text_light_nodisable" id="0x01060004" />

  <!-- {@deprecated Use a text color from your theme instead.} -->

  <public type="color" name="secondary_text_dark" id="0x01060005" />

  <!-- {@deprecated Use a text color from your theme instead.} -->

  <public type="color" name="secondary_text_dark_nodisable" id="0x01060006" />

  <!-- {@deprecated Use a text color from your theme instead.} -->

  <public type="color" name="secondary_text_light" id="0x01060007" />

  <!-- {@deprecated Use a text color from your theme instead.} -->

  <public type="color" name="secondary_text_light_nodisable" id="0x01060008" />

  <!-- Equivalent to 0xff808080 -->

  <public type="color" name="tab_indicator_text" id="0x01060009" />

  <!-- Equivalent to 0xff000000 -->

  <public type="color" name="widget_edittext_dark" id="0x0106000a" />

  <public type="color" name="white" id="0x0106000b" />

  <public type="color" name="black" id="0x0106000c" />

  <public type="color" name="transparent" id="0x0106000d" />

  <!-- Equivalent to 0xff000000 -->

  <public type="color" name="background_dark" id="0x0106000e" />

  <!-- Equivalent to 0xffffffff -->

  <public type="color" name="background_light" id="0x0106000f" />

  <!-- {@deprecated Use a text color from your theme instead.} -->

  <public type="color" name="tertiary_text_dark" id="0x01060010" />

  <!-- {@deprecated Use a text color from your theme instead.} -->

  <public type="color" name="tertiary_text_light" id="0x01060011" />



  <public type="array" name="emailAddressTypes" id="0x01070000" />