From b4fc67ea247405a5f42662242cc3c97d361e1ff3 Mon Sep 17 00:00:00 2001 From: Tsung-Mao Fang Date: Mon, 10 Feb 2020 05:45:33 +0000 Subject: [PATCH] Revert "Revert "Use system-api lib to get badged, shadowed icons(2/n)"" This reverts commit 94b8055f1c214190ba4878bcb11a624f5866f417. Reason for revert: Revert this cl and fix broken test cases. Change-Id: I61a190b4beba8db2fe2faab45e5dd6921dc681ec Fix: 149112222 Fix: 149090275 Test: Run all Setting robo tests --- .../AppHeaderPreferenceController.java | 5 ++- .../applications/AppInfoWithHeader.java | 5 ++- .../widget/EntityHeaderController.java | 3 +- .../applications/AppInfoWithHeaderTest.java | 3 +- ...AppHeaderViewPreferenceControllerTest.java | 3 ++ .../shadow/ShadowSettingsLibUtils.java | 36 +++++++++++++++++++ .../testutils/shadow/ShadowUtils.java | 8 +++++ .../widget/EntityHeaderControllerTest.java | 17 --------- 8 files changed, 54 insertions(+), 26 deletions(-) create mode 100644 tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsLibUtils.java diff --git a/src/com/android/settings/applications/AppHeaderPreferenceController.java b/src/com/android/settings/applications/AppHeaderPreferenceController.java index 8a77d6f07fd..0f473e7f08c 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,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)) diff --git a/src/com/android/settings/applications/AppInfoWithHeader.java b/src/com/android/settings/applications/AppInfoWithHeader.java index 9e3842e578a..7bf9f6460ac 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,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)) diff --git a/src/com/android/settings/widget/EntityHeaderController.java b/src/com/android/settings/widget/EntityHeaderController.java index 8e31290577e..440882f14d7 100644 --- a/src/com/android/settings/widget/EntityHeaderController.java +++ b/src/com/android/settings/widget/EntityHeaderController.java @@ -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; } diff --git a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java index 1f63c9c4e48..a161f84e94a 100644 --- a/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java @@ -39,6 +39,7 @@ 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.ShadowSettingsLibUtils; import com.android.settings.widget.EntityHeaderController; import com.android.settingslib.applications.AppUtils; import com.android.settingslib.applications.ApplicationsState; @@ -58,7 +59,7 @@ import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(RobolectricTestRunner.class) -@Config(shadows = ShadowEntityHeaderController.class) +@Config(shadows = {ShadowEntityHeaderController.class, ShadowSettingsLibUtils.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 c82cbe52f87..6684e1ad5b5 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java @@ -42,6 +42,7 @@ import androidx.lifecycle.LifecycleOwner; import androidx.preference.PreferenceScreen; import com.android.settings.R; +import com.android.settings.testutils.shadow.ShadowSettingsLibUtils; import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.core.lifecycle.Lifecycle; import com.android.settingslib.widget.LayoutPreference; @@ -54,8 +55,10 @@ 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 = ShadowSettingsLibUtils.class) public class AppHeaderViewPreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsLibUtils.java b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsLibUtils.java new file mode 100644 index 00000000000..2fce5ad80fb --- /dev/null +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowSettingsLibUtils.java @@ -0,0 +1,36 @@ +/* + * Copyright (C) 2020 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.testutils.shadow; + +import android.content.Context; +import android.content.pm.ApplicationInfo; +import android.graphics.drawable.ColorDrawable; +import android.graphics.drawable.Drawable; + +import com.android.settingslib.Utils; + +import org.robolectric.annotation.Implementation; +import org.robolectric.annotation.Implements; + +@Implements(Utils.class) +public class ShadowSettingsLibUtils { + + @Implementation + protected static Drawable getBadgedIcon(Context context, ApplicationInfo appInfo) { + return new ColorDrawable(0); + } +} 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 c1f33c6bdde..eadd33a6af4 100644 --- a/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java +++ b/tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java @@ -18,7 +18,10 @@ 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; @@ -144,6 +147,11 @@ 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 1d600a49f99..df9a2c187a1 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -30,7 +30,6 @@ 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; @@ -38,7 +37,6 @@ 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; @@ -46,7 +44,6 @@ 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; @@ -257,20 +254,6 @@ 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