From 94b8055f1c214190ba4878bcb11a624f5866f417 Mon Sep 17 00:00:00 2001 From: Bill Peckham Date: Fri, 7 Feb 2020 21:52:25 +0000 Subject: [PATCH] Revert "Use system-api lib to get badged, shadowed icons(2/n)" This reverts commit dbecbe6f61692af58199f1fdf188aa9a8b60a1a5. Reason for revert: b/149112222 Change-Id: I11981b2daacf8b07177fe906d88de05ca40810c1 --- .../AppHeaderPreferenceController.java | 5 +++-- .../applications/AppInfoWithHeader.java | 5 +++-- .../settings/widget/EntityHeaderController.java | 3 ++- .../applications/AppInfoWithHeaderTest.java | 3 +-- .../AppHeaderViewPreferenceControllerTest.java | 3 --- .../settings/testutils/shadow/ShadowUtils.java | 8 -------- .../widget/EntityHeaderControllerTest.java | 17 +++++++++++++++++ 7 files changed, 26 insertions(+), 18 deletions(-) diff --git a/src/com/android/settings/applications/AppHeaderPreferenceController.java b/src/com/android/settings/applications/AppHeaderPreferenceController.java index 0f473e7f08c..8a77d6f07fd 100644 --- a/src/com/android/settings/applications/AppHeaderPreferenceController.java +++ b/src/com/android/settings/applications/AppHeaderPreferenceController.java @@ -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,7 +94,8 @@ public class AppHeaderPreferenceController extends BasePreferenceController impl EntityHeaderController .newInstance(activity, mParent, mHeaderPreference.findViewById(R.id.entity_header)) .setRecyclerView(mParent.getListView(), mLifecycle) - .setIcon(Utils.getBadgedIcon(mParent.getContext(), mPackageInfo.applicationInfo)) + .setIcon(IconDrawableFactory.newInstance(activity).getBadgedIcon( + mPackageInfo.applicationInfo)) .setLabel(mPackageInfo.applicationInfo.loadLabel(packageManager)) .setSummary(mPackageInfo) .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo)) diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java index 7bf9f6460ac..9e3842e578a 100644 --- a/src/com/android/settings/applications/AppInfoWithHeader.java +++ b/src/com/android/settings/applications/AppInfoWithHeader.java @@ -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,7 +47,8 @@ public abstract class AppInfoWithHeader extends AppInfoBase { final Preference pref = EntityHeaderController .newInstance(activity, this, null /* header */) .setRecyclerView(getListView(), getSettingsLifecycle()) - .setIcon(Utils.getBadgedIcon(getContext(), mPackageInfo.applicationInfo)) + .setIcon(IconDrawableFactory.newInstance(getContext()) + .getBadgedIcon(mPackageInfo.applicationInfo)) .setLabel(mPackageInfo.applicationInfo.loadLabel(mPm)) .setSummary(mPackageInfo) .setIsInstantApp(AppUtils.isInstant(mPackageInfo.applicationInfo)) diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index 440882f14d7..8e31290577e 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -29,6 +29,7 @@ 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; @@ -146,7 +147,7 @@ public class EntityHeaderController { * accessibility purposes. */ public EntityHeaderController setIcon(ApplicationsState.AppEntry appEntry) { - mIcon = Utils.getBadgedIcon(mAppContext, appEntry.info); + mIcon = IconDrawableFactory.newInstance(mAppContext).getBadgedIcon(appEntry.info); return this; } diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index a1a0ee1cbf9..1f63c9c4e48 100644 --- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java @@ -39,7 +39,6 @@ import androidx.preference.PreferenceScreen; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.shadow.ShadowEntityHeaderController; -import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; @@ -59,7 +58,7 @@ import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(RobolectricTestRunner.class) -@Config(shadows = {ShadowEntityHeaderController.class, ShadowUtils.class}) +@Config(shadows = ShadowEntityHeaderController.class) public class AppInfoWithHeaderTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java index 55890c910de..c82cbe52f87 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java @@ -42,7 +42,6 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; -import com.android.settings.testutils.shadow.ShadowUtils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.LayoutPreference; @@ -55,10 +54,8 @@ import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; -import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) -@Config(shadows = ShadowUtils.class) public class AppHeaderViewPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java index eadd33a6af4..c1f33c6bdde 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java @@ -18,10 +18,7 @@ package com.android.settings.testutils.shadow; import android.content.ComponentName; import android.content.Context; -import android.content.pm.ApplicationInfo; import android.content.pm.PackageManager; -import android.graphics.drawable.ColorDrawable; -import android.graphics.drawable.Drawable; import android.hardware.fingerprint.FingerprintManager; import android.os.UserHandle; import android.os.UserManager; @@ -147,11 +144,6 @@ public class ShadowUtils { return sResultLinks; } - @Implementation - protected static Drawable getBadgedIcon(Context context, ApplicationInfo appInfo) { - return new ColorDrawable(0); - } - public static void setHandledDomains(ArraySet links) { sResultLinks = links; } diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index df9a2c187a1..1d600a49f99 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -30,6 +30,7 @@ import android.app.ActionBar; import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; +import android.content.pm.ApplicationInfo; import android.content.pm.PackageInfo; import android.content.pm.ResolveInfo; import android.graphics.drawable.ColorDrawable; @@ -37,6 +38,7 @@ import android.os.UserHandle; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageButton; +import android.widget.ImageView; import android.widget.TextView; import androidx.fragment.app.Fragment; @@ -44,6 +46,7 @@ import androidx.fragment.app.FragmentActivity; import androidx.preference.Preference; import com.android.settings.R; +import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.widget.LayoutPreference; import org.junit.Before; @@ -254,6 +257,20 @@ public class EntityHeaderControllerTest { .isEqualTo(description); } + @Test + public void setIcon_usingAppEntry_shouldLoadIconFromDrawableFactory() { + final View view = mLayoutInflater + .inflate(R.layout.settings_entity_header, null /* root */); + final ApplicationsState.AppEntry entry = mock(ApplicationsState.AppEntry.class); + entry.info = new ApplicationInfo(); + mController = EntityHeaderController.newInstance(mActivity, mFragment, view); + mController.setIcon(entry).done(mActivity); + final ImageView iconView = view.findViewById(R.id.entity_header_icon); + + // ... entry.icon is still empty. This means the icon didn't come from cache. + assertThat(entry.icon).isNull(); + } + @Test public void bindButton_hasAppNotifIntent_shouldShowButton() { final View appLinks = mLayoutInflater