PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Revert "Use system-api lib to get badged, shadowed icons(2/n)"""

Browse Source
This commit is contained in:
TreeHugger Robot
2020-02-10 08:07:50 +00:00
committed by Android (Google) Code Review
parent 8c8e77a405 b4fc67ea24
commit 0b6f6b7eaf
8 changed files with 54 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/com/android/settings/applications/AppHeaderPreferenceController.java
View File

@@ -21,11 +21,11 @@ import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
import android.util.IconDrawableFactory;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.Utils;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.widget.EntityHeaderController;
@@ -94,8 +94,7 @@ public class AppHeaderPreferenceController extends BasePreferenceController impl
EntityHeaderController
.newInstance(activity, mParent, mHeaderPreference.findViewById(R.id.entity_header))
.setRecyclerView(mParent.getListView(), mLifecycle)
.setIcon(IconDrawableFactory.newInstance(activity).getBadgedIcon(
mPackageInfo.applicationInfo))
.setIcon(Utils.getBadgedIcon(mParent.getContext(), mPackageInfo.applicationInfo))
.setLabel(mPackageInfo.applicationInfo.loadLabel(packageManager))
.setSummary(mPackageInfo)
.setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))

5
src/com/android/settings/applications/AppInfoWithHeader.java
View File

@@ -20,11 +20,11 @@ import static com.android.settings.widget.EntityHeaderController.ActionType;
import android.app.Activity;
import android.os.Bundle;
import android.util.IconDrawableFactory;
import android.util.Log;
import androidx.preference.Preference;
import com.android.settings.Utils;
import com.android.settings.widget.EntityHeaderController;
import com.android.settingslib.applications.AppUtils;
@@ -47,8 +47,7 @@ public abstract class AppInfoWithHeader extends AppInfoBase {
final Preference pref = EntityHeaderController
.newInstance(activity, this, null /* header */)
.setRecyclerView(getListView(), getSettingsLifecycle())
.setIcon(IconDrawableFactory.newInstance(getContext())
.getBadgedIcon(mPackageInfo.applicationInfo))
.setIcon(Utils.getBadgedIcon(getContext(), mPackageInfo.applicationInfo))
.setLabel(mPackageInfo.applicationInfo.loadLabel(mPm))
.setSummary(mPackageInfo)
.setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo))

3
src/com/android/settings/widget/EntityHeaderController.java
View File

@@ -29,7 +29,6 @@ import android.graphics.drawable.Drawable;
import android.os.Bundle;
import android.os.UserHandle;
import android.text.TextUtils;
import android.util.IconDrawableFactory;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
@@ -147,7 +146,7 @@ public class EntityHeaderController {
* accessibility purposes.
*/
public EntityHeaderController setIcon(ApplicationsState.AppEntry appEntry) {
mIcon = IconDrawableFactory.newInstance(mAppContext).getBadgedIcon(appEntry.info);
mIcon = Utils.getBadgedIcon(mAppContext, appEntry.info);
return this;
}