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

Commit 8a4260e4 authored by William Harmon's avatar William Harmon Committed by android-build-merger
Browse files

Merge \\"Allow system apps to have disabled QS tiles.\\" into nyc-mr1-dev am: 611093b1 

am: 431910e0

Change-Id: Iaf7b4ea2899ac7793a41586965090def52eaba1a
parents e36ec078 431910e0

packages/SystemUI/src/com/android/systemui/qs/external/CustomTile.java

+9 −2
Original line number Diff line number Diff line
@@ -82,8 +82,11 @@ public class CustomTile extends QSTile<QSTile.State> implements TileChangeListen 
    private void setTileIcon() {

        try {

            PackageManager pm = mContext.getPackageManager();

            ServiceInfo info = pm.getServiceInfo(mComponent,

                    PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE);

            int flags = PackageManager.MATCH_ENCRYPTION_AWARE_AND_UNAWARE;

            if (isSystemApp(pm)) {

                flags |= PackageManager.MATCH_DISABLED_COMPONENTS;

            }

            ServiceInfo info = pm.getServiceInfo(mComponent, flags);

            int icon = info.icon != 0 ? info.icon

                    : info.applicationInfo.icon;

            // Update the icon if its not set or is the default icon.
@@ -103,6 +106,10 @@ public class CustomTile extends QSTile<QSTile.State> implements TileChangeListen 
        }

    }



    private boolean isSystemApp(PackageManager pm) throws PackageManager.NameNotFoundException {

        return pm.getApplicationInfo(mComponent.getPackageName(), 0).isSystemApp();

    }



    /**

     * Compare two icons, only works for resources.

     */