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

Commit a13ed46d authored by Sunny Goyal's avatar Sunny Goyal Committed by android-build-merger
Browse files

Merge "Using IconDrawableFactory to properly handle icon badging in Permissions screen" into oc-dev 

am: 01907811

Change-Id: I4e377b8a4490432beaeff6c9644d0cafa12e3cf4
parents 2605488b 01907811

src/com/android/packageinstaller/permission/ui/handheld/AllAppPermissionsFragment.java

+3 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import android.preference.Preference; 
import android.preference.PreferenceCategory;

import android.preference.PreferenceGroup;

import android.provider.Settings;

import android.util.IconDrawableFactory;

import android.util.Log;

import android.view.MenuItem;

import android.widget.Switch;
@@ -124,7 +125,8 @@ public final class AllAppPermissionsFragment extends SettingsWithHeader { 
            PackageInfo info = pm.getPackageInfo(pkg, PackageManager.GET_PERMISSIONS);



            ApplicationInfo appInfo = info.applicationInfo;

            final Drawable icon = appInfo.loadIcon(pm);

            final Drawable icon =

                    IconDrawableFactory.newInstance(getContext()).getBadgedIcon(appInfo);

            final CharSequence label = appInfo.loadLabel(pm);

            Intent infoIntent = null;

            if (!getActivity().getIntent().getBooleanExtra(

src/com/android/packageinstaller/permission/ui/handheld/AppPermissionsFragment.java

+5 −3
Original line number Diff line number Diff line
@@ -16,6 +16,8 @@ 


package com.android.packageinstaller.permission.ui.handheld;



import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;



import android.app.ActionBar;

import android.app.Activity;

import android.app.AlertDialog;
@@ -35,6 +37,7 @@ import android.preference.Preference.OnPreferenceClickListener; 
import android.preference.PreferenceScreen;

import android.preference.SwitchPreference;

import android.provider.Settings;

import android.util.IconDrawableFactory;

import android.util.Log;

import android.view.Menu;

import android.view.MenuInflater;
@@ -42,6 +45,7 @@ import android.view.MenuItem; 
import android.view.View;

import android.widget.Switch;

import android.widget.Toast;



import com.android.packageinstaller.R;

import com.android.packageinstaller.permission.model.AppPermissionGroup;

import com.android.packageinstaller.permission.model.AppPermissions;
@@ -55,8 +59,6 @@ import com.android.settingslib.RestrictedLockUtils; 
import java.util.ArrayList;

import java.util.List;



import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;



public final class AppPermissionsFragment extends SettingsWithHeader

        implements OnPreferenceChangeListener {
@@ -171,7 +173,7 @@ public final class AppPermissionsFragment extends SettingsWithHeader 
                    .setData(Uri.fromParts("package", packageInfo.packageName, null));

        }



        Drawable icon = appInfo.loadIcon(pm);

        Drawable icon = IconDrawableFactory.newInstance(activity).getBadgedIcon(appInfo);

        CharSequence label = appInfo.loadLabel(pm);

        fragment.setHeader(icon, label, infoIntent);