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

Commit 0eb76cc3 authored by Hyunyoung Song's avatar Hyunyoung Song Committed by Android (Google) Code Review
Browse files

Merge "ApplicationPackageManager should fetch Resource from non system context"

parents 03f6440e 013f062d

core/java/android/app/ApplicationPackageManager.java

+2 −3
Original line number Diff line number Diff line
@@ -1301,8 +1301,7 @@ public class ApplicationPackageManager extends PackageManager { 
    }



    @Override public Drawable getDefaultActivityIcon() {

        return Resources.getSystem().getDrawable(

            com.android.internal.R.drawable.sym_def_app_icon);

        return mContext.getDrawable(com.android.internal.R.drawable.sym_def_app_icon);

    }



    @Override public Drawable getApplicationIcon(ApplicationInfo info) {
@@ -1440,7 +1439,7 @@ public class ApplicationPackageManager extends PackageManager { 
        if (density <= 0) {

            density = mContext.getResources().getDisplayMetrics().densityDpi;

        }

        return Resources.getSystem().getDrawableForDensity(drawableId, density);

        return mContext.getResources().getDrawableForDensity(drawableId, density);

    }



    private Drawable getManagedProfileIconForDensity(UserHandle user, int drawableId, int density) {

core/res/res/drawable/sym_def_app_icon_background.xml

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ 
    android:viewportHeight="108.0"

    android:viewportWidth="108.0"

    xmlns:android="http://schemas.android.com/apk/res/android">

    <path android:fillColor="@android:color/material_deep_teal_500"

    <path android:fillColor="@android:color/accent_device_default_light"

        android:pathData="M0,0h108v108h-108z"

        android:strokeColor="#66FFFFFF" android:strokeWidth="0.8"/>

    <path android:fillColor="#00000000" android:pathData="M19,0L19,108"