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

Commit 97c5a993 authored by Evan Millar's avatar Evan Millar Committed by Android Git Automerger
Browse files

am 326eaa33: Merge change I0fae86b8 into eclair 

Merge commit '326eaa33' into eclair-mr2

* commit '326eaa33':
  Make QuickContact styles public.
parents 62174d02 326eaa33

api/current.xml

+66 −0
Original line number Diff line number Diff line
@@ -6389,6 +6389,72 @@ 
 visibility="public"

>

</field>

<field name="quickContactBadgeStyleSmallWindowLarge"

 type="int"

 transient="false"

 volatile="false"

 value="16843443"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="quickContactBadgeStyleSmallWindowMedium"

 type="int"

 transient="false"

 volatile="false"

 value="16843442"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="quickContactBadgeStyleSmallWindowSmall"

 type="int"

 transient="false"

 volatile="false"

 value="16843441"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="quickContactBadgeStyleWindowLarge"

 type="int"

 transient="false"

 volatile="false"

 value="16843440"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="quickContactBadgeStyleWindowMedium"

 type="int"

 transient="false"

 volatile="false"

 value="16843439"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="quickContactBadgeStyleWindowSmall"

 type="int"

 transient="false"

 volatile="false"

 value="16843438"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="radioButtonStyle"

 type="int"

 transient="false"

core/res/res/values/public.xml

+8 −0
Original line number Diff line number Diff line
@@ -1194,4 +1194,12 @@ 
  <public type="drawable" name="screen_background_dark_transparent" />

  <public type="drawable" name="screen_background_light_transparent" />

  <public type="drawable" name="stat_notify_sdcard_prepare" />

  

  <public type="attr" name="quickContactBadgeStyleWindowSmall" />

  <public type="attr" name="quickContactBadgeStyleWindowMedium" />

  <public type="attr" name="quickContactBadgeStyleWindowLarge" />

  <public type="attr" name="quickContactBadgeStyleSmallWindowSmall" />

  <public type="attr" name="quickContactBadgeStyleSmallWindowMedium" />

  <public type="attr" name="quickContactBadgeStyleSmallWindowLarge" />

  

</resources>