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

Commit 03c08be3 authored by Hiroki Sato's avatar Hiroki Sato Committed by Android (Google) Code Review
Browse files

Merge changes I2c33ac38,I97f6ea06 into main 

* changes:
  Remove wrongly added public-staging resource ids
  Add missing pointerIconVector inverse color attributes
parents e3848ab4 a6bdfbf9

core/res/res/values/public-staging.xml

+8 −8
Original line number Diff line number Diff line
@@ -116,14 +116,14 @@ 
    <public name="alternateLauncherIcons"/>

    <!-- @FlaggedApi(android.content.pm.Flags.FLAG_CHANGE_LAUNCHER_BADGING) -->

    <public name="alternateLauncherLabels"/>

    <!-- @hide Only for device overlay to use this. -->

    <public name="pointerIconVectorFill"/>

    <!-- @hide Only for device overlay to use this. -->

    <public name="pointerIconVectorFillInverse"/>

    <!-- @hide Only for device overlay to use this. -->

    <public name="pointerIconVectorStroke"/>

    <!-- @hide Only for device overlay to use this. -->

    <public name="pointerIconVectorStrokeInverse"/>

    <!-- @hide Wrongly added here. -->

    <public name="removed_pointerIconVectorFill"/>

    <!-- @hide Wrongly added here. -->

    <public name="removed_pointerIconVectorFillInverse"/>

    <!-- @hide Wrongly added here. -->

    <public name="removed_pointerIconVectorStroke"/>

    <!-- @hide Wrongly added here. -->

    <public name="removed_pointerIconVectorStrokeInverse"/>

  </staging-public-group>



  <staging-public-group type="id" first-id="0x01b20000">

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -1726,10 +1726,12 @@ 
  <java-symbol type="style" name="PointerIconVectorStyleFillBlue" />

  <java-symbol type="style" name="PointerIconVectorStyleFillPurple" />

  <java-symbol type="attr" name="pointerIconVectorFill" />

  <java-symbol type="attr" name="pointerIconVectorFillInverse" />

  <java-symbol type="style" name="PointerIconVectorStyleStrokeWhite" />

  <java-symbol type="style" name="PointerIconVectorStyleStrokeBlack" />

  <java-symbol type="style" name="PointerIconVectorStyleStrokeNone" />

  <java-symbol type="attr" name="pointerIconVectorStroke" />

  <java-symbol type="attr" name="pointerIconVectorStrokeInverse" />

  <java-symbol type="style" name="TextAppearance.DeviceDefault.Notification.Title" />

  <java-symbol type="style" name="TextAppearance.DeviceDefault.Notification.Info" />