Merge "Add actor attr and QueriesOverlayable styleable" into rvc-dev

api/current.txt

@@ -278,6 +278,7 @@ package android {
     field public static final int activityCloseExitAnimation = 16842939; // 0x10100bb
     field public static final int activityOpenEnterAnimation = 16842936; // 0x10100b8
     field public static final int activityOpenExitAnimation = 16842937; // 0x10100b9
+    field public static final int actor = 16844313; // 0x1010619
     field public static final int addPrintersActivity = 16843750; // 0x10103e6
     field public static final int addStatesFromChildren = 16842992; // 0x10100f0
     field public static final int adjustViewBounds = 16843038; // 0x101011e

core/res/res/values/attrs_manifest.xml

@@ -2121,6 +2121,35 @@
     <declare-styleable name="AndroidManifestQueriesProvider" parent="AndroidManifestQueries" >
         <attr name="authorities" />
     </declare-styleable>
+    <!--
+        Matches an overlayable, its overlays, its actor, and/or its containing target.
+        A target or actor must always be specified, but can be combined for more specificity.
+        Valid combinations and what they match are:
+
+        targetPackage:
+         - All overlays targeting any overlayables inside 'targetPackage'
+
+        targetPackage + targetName:
+         - All overlays targeting the overlayable 'targetName' inside 'targetPackage'
+
+        targetPackage + targetName + actor:
+         - All overlays targeting the overlayable 'targetName' inside 'targetPackage' if the
+           overlayable specifies 'actor'
+
+        targetPackage + actor:
+         - All overlays targeting overlayables inside 'targetPackage' that specify `actor`
+         - The actor itself if the above matches
+
+        actor:
+         - All overlays targeting overlayables that specify `actor`
+         - All targets that contain an overlayable that specifies `actor`
+         - The actor itself
+    -->
+    <declare-styleable name="AndroidManifestQueriesOverlayable">
+        <attr name="targetPackage" />
+        <attr name="targetName"/>
+        <attr name="actor" format="string" />
+    </declare-styleable>
 
 
     <!-- The <code>static-library</code> tag declares that this apk is providing itself

core/res/res/values/public.xml

@@ -3019,6 +3019,7 @@
       <public name="preserveLegacyExternalStorage" />
       <public name="mimeGroup" />
       <public name="gwpAsanMode" />
+      <public name="actor" />
     </public-group>
 
     <public-group type="drawable" first-id="0x010800b5">