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

Commit 8e0d56ea authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "[PM] Change LauncherIconConfig (1/N)" into main

parents a0e0a436 6f5bb8ff

core/api/current.txt

+2 −0
Original line number Diff line number Diff line
@@ -478,6 +478,8 @@ package android { 
    field public static final int alpha = 16843551; // 0x101031f

    field public static final int alphabeticModifiers = 16844110; // 0x101054e

    field public static final int alphabeticShortcut = 16843235; // 0x10101e3

    field @FlaggedApi("android.content.pm.change_launcher_badging") public static final int alternateLauncherIcons;

    field @FlaggedApi("android.content.pm.change_launcher_badging") public static final int alternateLauncherLabels;

    field public static final int alwaysDrawnWithCache = 16842991; // 0x10100ef

    field public static final int alwaysRetainTaskState = 16843267; // 0x1010203

    field @Deprecated public static final int amPmBackgroundColor = 16843941; // 0x10104a5

core/res/res/values/attrs_manifest.xml

+16 −0
Original line number Diff line number Diff line
@@ -2273,6 +2273,22 @@ 
        <attr name="enableOnBackInvokedCallback" format="boolean"/>



        <attr name="intentMatchingFlags"/>



        <!-- Specifies the set of drawable resources that can be used in place

             of an existing declared icon or banner for activities that appear

             in the app launcher. The resource referenced must be an array of

             drawable resources and can contain at most 500 items.

             {@link android.content.pm.PackageManager#changeLauncherIconConfig}

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

        <attr name="alternateLauncherIcons" format="reference" />



        <!-- Specifies the set of string resources that can be used in place

             of an existing declared label for activities that appear

             in the app launcher. The resource referenced must be an array of

             string resources and can contain at most 500 items.

             {@link android.content.pm.PackageManager#changeLauncherIconConfig}

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

        <attr name="alternateLauncherLabels" format="reference" />

    </declare-styleable>



    <!-- An attribution is a logical part of an app and is identified by a tag.

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

+4 −0
Original line number Diff line number Diff line
@@ -127,6 +127,10 @@ 
    <public name="intentMatchingFlags"/>

    <!-- @FlaggedApi(android.view.inputmethod.Flags.FLAG_IME_SWITCHER_REVAMP_API) -->

    <public name="layoutLabel"/>

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

    <public name="alternateLauncherIcons"/>

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

    <public name="alternateLauncherLabels"/>

  </staging-public-group>



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