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

Commit a83bfca6 authored by Todd Kennedy's avatar Todd Kennedy
Browse files

make round icon usage configurable 

We want to only use round icons for Nexus devices, so, add a configuration
boolean to control it. By default we will use the legacy, rectangle icons.

Bug: 28981414
Change-Id: Ib6448bc09287de852a48a943461a6882bd890a30
parent 8d1f3f60

core/java/android/content/pm/PackageParser.java

+9 −6
Original line number Diff line number Diff line
@@ -2511,7 +2511,6 @@ public class PackageParser { 


        TypedArray sa = res.obtainAttributes(parser,

                com.android.internal.R.styleable.AndroidManifestPermissionGroup);



        if (!parsePackageItemInfo(owner, perm.info, outError,

                "<permission-group>", sa, true /*nameRequired*/,

                com.android.internal.R.styleable.AndroidManifestPermissionGroup_name,
@@ -3360,7 +3359,9 @@ public class PackageParser { 
            }

        }



        int roundIconVal = sa.getResourceId(roundIconRes, 0);

        final boolean useRoundIcon =

                Resources.getSystem().getBoolean(com.android.internal.R.bool.config_useRoundIcon);

        int roundIconVal = useRoundIcon ? sa.getResourceId(roundIconRes, 0) : 0;

        if (roundIconVal != 0) {

            outInfo.icon = roundIconVal;

            outInfo.nonLocalizedLabel = null;
@@ -4570,10 +4571,12 @@ public class PackageParser { 
            outInfo.nonLocalizedLabel = v.coerceToString();

        }



        int roundIcon = sa.getResourceId(

                com.android.internal.R.styleable.AndroidManifestIntentFilter_roundIcon, 0);

        if (roundIcon != 0) {

            outInfo.icon = roundIcon;

        final boolean useRoundIcon =

                Resources.getSystem().getBoolean(com.android.internal.R.bool.config_useRoundIcon);

        int roundIconVal = useRoundIcon ? sa.getResourceId(

                com.android.internal.R.styleable.AndroidManifestIntentFilter_roundIcon, 0) : 0;

        if (roundIconVal != 0) {

            outInfo.icon = roundIconVal;

        } else {

            outInfo.icon = sa.getResourceId(

                    com.android.internal.R.styleable.AndroidManifestIntentFilter_icon, 0);

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -2489,4 +2489,7 @@ 
    <!-- Component that is the default launcher when demo mode is enabled. -->

    <string name="config_demoModeLauncherComponent"></string>



    <!-- Flag indicating whether round icons should be parsed from the application manifest. -->

    <bool name="config_useRoundIcon">false</bool>



</resources>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -2615,4 +2615,6 @@ 


  <!-- Used internally for assistant to launch activity transitions -->

  <java-symbol type="id" name="cross_task_transition" />



  <java-symbol type="bool" name="config_useRoundIcon" />

</resources>