diff --git a/res/drawable/ic_instant_apps_badge.xml b/res/drawable/ic_instant_apps_badge.xml deleted file mode 100644 index 115aa83162b..00000000000 --- a/res/drawable/ic_instant_apps_badge.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/res/drawable/ic_instant_apps_badge_bg.xml b/res/drawable/ic_instant_apps_badge_bg.xml deleted file mode 100644 index bf8d3ea5951..00000000000 --- a/res/drawable/ic_instant_apps_badge_bg.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - \ No newline at end of file diff --git a/res/layout/app_details.xml b/res/layout/app_details.xml index 8cfa8b93d81..b05c0dcfef2 100644 --- a/res/layout/app_details.xml +++ b/res/layout/app_details.xml @@ -31,28 +31,13 @@ android:paddingEnd="0dp" android:paddingTop="24dp" android:paddingBottom="24dp"> - - - - - + 56dp - 6dp 120dp 40dp 16dp diff --git a/src/com/android/settings/applications/AppHeaderController.java b/src/com/android/settings/applications/AppHeaderController.java index 29acaa49a6f..af1127e9faa 100644 --- a/src/com/android/settings/applications/AppHeaderController.java +++ b/src/com/android/settings/applications/AppHeaderController.java @@ -63,6 +63,7 @@ public class AppHeaderController { } public static final String PREF_KEY_APP_HEADER = "pref_app_header"; + private static final String TAG = "AppDetailFeature"; private final Context mContext; @@ -179,10 +180,6 @@ public class AppHeaderController { ImageView iconView = mAppHeader.findViewById(R.id.app_detail_icon); if (iconView != null) { iconView.setImageDrawable(mIcon); - ImageView badgeView = mAppHeader.findViewById(R.id.app_icon_instant_apps_badge); - if (badgeView != null) { - badgeView.setVisibility(mIsInstantApp ? View.VISIBLE : View.GONE); - } } setText(R.id.app_detail_title, mLabel); setText(R.id.app_detail_summary, mSummary); diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java index 2c9599b39e7..6b1ef6756ec 100644 --- a/src/com/android/settings/applications/AppInfoWithHeader.java +++ b/src/com/android/settings/applications/AppInfoWithHeader.java @@ -21,6 +21,7 @@ import static com.android.settings.applications.AppHeaderController.ActionType; import android.app.Activity; import android.os.Bundle; import android.support.v7.preference.Preference; +import android.util.IconDrawableFactory; import android.util.Log; import com.android.settings.overlay.FeatureFactory; @@ -43,7 +44,8 @@ public abstract class AppInfoWithHeader extends AppInfoBase { final Preference pref = FeatureFactory.getFactory(activity) .getApplicationFeatureProvider(activity) .newAppHeaderController(this, null /* appHeader */) - .setIcon(mPackageInfo.applicationInfo.loadIcon(mPm)) + .setIcon(IconDrawableFactory.newInstance(activity) + .getBadgedIcon(mPackageInfo.applicationInfo)) .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm)) .setSummary(mPackageInfo) .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo)) diff --git a/src/com/android/settings/applications/ManageApplications.java b/src/com/android/settings/applications/ManageApplications.java index 3cc401511b9..f24c3f70aeb 100644 --- a/src/com/android/settings/applications/ManageApplications.java +++ b/src/com/android/settings/applications/ManageApplications.java @@ -23,7 +23,6 @@ import android.content.Intent; import android.content.pm.ApplicationInfo; import android.content.pm.PackageItemInfo; import android.content.pm.PackageManager; -import android.graphics.drawable.AdaptiveIconDrawable; import android.icu.text.AlphabeticIndex; import android.os.Bundle; import android.os.Environment; @@ -35,7 +34,6 @@ import android.preference.PreferenceFrameLayout; import android.support.annotation.VisibleForTesting; import android.text.TextUtils; import android.util.ArraySet; -import android.util.LauncherIcons; import android.util.Log; import android.view.LayoutInflater; import android.view.Menu; @@ -55,8 +53,8 @@ import android.widget.FrameLayout; import android.widget.ListView; import android.widget.SectionIndexer; import android.widget.Spinner; - import android.widget.TextView; + import com.android.internal.logging.nano.MetricsProto.MetricsEvent; import com.android.settings.R; import com.android.settings.Settings.AllApplicationsActivity; @@ -826,7 +824,6 @@ public class ManageApplications extends InstrumentedPreferenceFragment private final AppStateBaseBridge mExtraInfoBridge; private final Handler mBgHandler; private final Handler mFgHandler; - private final LauncherIcons mLauncherIcons; private int mFilterMode; private ArrayList mBaseEntries; @@ -882,7 +879,6 @@ public class ManageApplications extends InstrumentedPreferenceFragment mContext = manageApplications.getActivity(); mPm = mContext.getPackageManager(); mFilterMode = filterMode; - mLauncherIcons = new LauncherIcons(mContext); if (mManageApplications.mListType == LIST_TYPE_NOTIFICATION) { mExtraInfoBridge = new AppStateNotificationBridge(mContext, mState, this, manageApplications.mNotifBackend); @@ -1317,9 +1313,6 @@ public class ManageApplications extends InstrumentedPreferenceFragment } mState.ensureIcon(entry); if (entry.icon != null) { - if (entry.icon instanceof AdaptiveIconDrawable) { - entry.icon = mLauncherIcons.wrapIconDrawableWithShadow(entry.icon); - } holder.appIcon.setImageDrawable(entry.icon); } updateSummary(holder); diff --git a/src/com/android/settings/applications/ProcessStatsDetail.java b/src/com/android/settings/applications/ProcessStatsDetail.java index c23da04e86c..6c0928c1e6e 100644 --- a/src/com/android/settings/applications/ProcessStatsDetail.java +++ b/src/com/android/settings/applications/ProcessStatsDetail.java @@ -39,6 +39,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceCategory; import android.text.format.Formatter; import android.util.ArrayMap; +import android.util.IconDrawableFactory; import android.util.Log; import android.view.Menu; import android.view.MenuInflater; @@ -129,7 +130,7 @@ public class ProcessStatsDetail extends SettingsPreferenceFragment { .getApplicationFeatureProvider(activity) .newAppHeaderController(this, null /* appHeader */) .setIcon(mApp.mUiTargetApp != null - ? mApp.mUiTargetApp.loadIcon(mPm) + ? IconDrawableFactory.newInstance(activity).getBadgedIcon(mApp.mUiTargetApp) : new ColorDrawable(0)) .setLabel(mApp.mUiLabel) .setPackageName(mApp.mPackage) diff --git a/src/com/android/settings/datausage/AppDataUsage.java b/src/com/android/settings/datausage/AppDataUsage.java index d0d0c46561f..96740e27a5b 100644 --- a/src/com/android/settings/datausage/AppDataUsage.java +++ b/src/com/android/settings/datausage/AppDataUsage.java @@ -40,6 +40,7 @@ import android.support.v7.preference.Preference; import android.support.v7.preference.PreferenceCategory; import android.text.format.Formatter; import android.util.ArraySet; +import android.util.IconDrawableFactory; import android.view.View; import android.widget.AdapterView; @@ -159,7 +160,7 @@ public class AppDataUsage extends DataUsageBase implements Preference.OnPreferen PackageManager pm = getPackageManager(); try { ApplicationInfo info = pm.getApplicationInfo(mPackages.valueAt(0), 0); - mIcon = info.loadIcon(pm); + mIcon = IconDrawableFactory.newInstance(getActivity()).getBadgedIcon(info); mLabel = info.loadLabel(pm); mPackageName = info.packageName; } catch (PackageManager.NameNotFoundException e) { diff --git a/src/com/android/settings/notification/NotificationBackend.java b/src/com/android/settings/notification/NotificationBackend.java index c1ef018fe04..6226eac5d9b 100644 --- a/src/com/android/settings/notification/NotificationBackend.java +++ b/src/com/android/settings/notification/NotificationBackend.java @@ -18,7 +18,6 @@ package com.android.settings.notification; import android.app.INotificationManager; import android.app.NotificationChannel; import android.app.NotificationChannelGroup; -import android.app.NotificationManager; import android.content.Context; import android.content.Intent; import android.content.pm.ApplicationInfo; @@ -28,6 +27,7 @@ import android.content.pm.ParceledListSlice; import android.graphics.drawable.Drawable; import android.os.ServiceManager; import android.os.UserHandle; +import android.util.IconDrawableFactory; import android.util.Log; import com.android.settingslib.Utils; @@ -48,7 +48,7 @@ public class NotificationBackend { Log.e(TAG, "Error loading application label for " + row.pkg, t); row.label = row.pkg; } - row.icon = app.loadIcon(pm); + row.icon = IconDrawableFactory.newInstance(context).getBadgedIcon(app); row.banned = getNotificationsBanned(row.pkg, row.uid); row.showBadge = canShowBadge(row.pkg, row.uid); row.userId = UserHandle.getUserId(row.uid); diff --git a/tests/robotests/src/android/util/LauncherIcons.java b/tests/robotests/src/android/util/IconDrawableFactory.java similarity index 50% rename from tests/robotests/src/android/util/LauncherIcons.java rename to tests/robotests/src/android/util/IconDrawableFactory.java index a18cfaed1db..9d0d7df2601 100644 --- a/tests/robotests/src/android/util/LauncherIcons.java +++ b/tests/robotests/src/android/util/IconDrawableFactory.java @@ -16,17 +16,29 @@ package android.util; import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.content.pm.PackageItemInfo; +import android.graphics.drawable.ColorDrawable; import android.graphics.drawable.Drawable; /** - * This class is only needed to get around RoboElectric issue. + * This class is only needed to get around Robolectric issue. */ -public final class LauncherIcons { +public class IconDrawableFactory { - public LauncherIcons(Context context) { + public static IconDrawableFactory newInstance(Context context) { + return new IconDrawableFactory(); } - public Drawable wrapIconDrawableWithShadow(Drawable drawable) { - return drawable; + public Drawable getBadgedIcon(ApplicationInfo appInfo) { + return getBadgedIcon(appInfo, 0); + } + + public Drawable getBadgedIcon(ApplicationInfo appInfo, int userId) { + return getBadgedIcon(appInfo, appInfo, userId); + } + + public Drawable getBadgedIcon(PackageItemInfo itemInfo, ApplicationInfo appInfo, int userId) { + return new ColorDrawable(0); } } diff --git a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java index 030978f5880..eef21122514 100644 --- a/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppHeaderControllerTest.java @@ -18,6 +18,7 @@ package com.android.settings.applications; import static com.google.common.truth.Truth.assertThat; + import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyInt; import static org.mockito.Matchers.eq; @@ -38,7 +39,6 @@ import android.os.UserHandle; import android.support.v7.preference.Preference; import android.view.LayoutInflater; import android.view.View; -import android.widget.ImageView; import android.widget.TextView; import com.android.settings.R; @@ -276,17 +276,6 @@ public class AppHeaderControllerTest { .isEqualTo(View.GONE); } - // Ensure that the instant app label does not show up when we haven't told the controller the - // app is instant. - @Test - public void instantApps_normalAppsDontGetInstantAppsBadge() { - final View appHeader = mLayoutInflater.inflate(R.layout.app_details, null /* root */); - mController = new AppHeaderController(mContext, mFragment, appHeader); - mController.done(mActivity); - assertThat(appHeader.findViewById(R.id.app_icon_instant_apps_badge).getVisibility()) - .isEqualTo(View.GONE); - } - // Test that the "instant apps" label is present in the header when we have an instant app. @Test public void instantApps_expectedHeaderItem() { @@ -295,8 +284,6 @@ public class AppHeaderControllerTest { mController.setIsInstantApp(true); mController.done(mActivity); TextView label = appHeader.findViewById(R.id.install_type); - ImageView badgeView = appHeader.findViewById(R.id.app_icon_instant_apps_badge); - assertThat(badgeView.getVisibility()).isEqualTo(View.VISIBLE); assertThat(label.getVisibility()).isEqualTo(View.VISIBLE); assertThat(label.getText()).isEqualTo( appHeader.getResources().getString(R.string.install_type_instant));