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

Commit b4fc67ea authored by Tsung-Mao Fang's avatar Tsung-Mao Fang
Browse files

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

This reverts commit 94b8055f.

Reason for revert: Revert this cl and fix broken test cases.

Change-Id: I61a190b4beba8db2fe2faab45e5dd6921dc681ec
Fix: 149112222
Fix: 149090275
Test: Run all Setting robo tests
parent 1ab6dd7a

src/com/android/settings/applications/AppHeaderPreferenceController.java

+2 −3
Original line number Diff line number Diff line
@@ -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))

src/com/android/settings/applications/AppInfoWithHeader.java

+2 −3
Original line number Diff line number Diff line
@@ -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))

src/com/android/settings/widget/EntityHeaderController.java

+1 −2
Original line number Diff line number Diff line
@@ -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;

    }

tests/robotests/src/com/android/settings/applications/AppInfoWithHeaderTest.java

+2 −1
Original line number Diff line number Diff line
@@ -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)

tests/robotests/src/com/android/settings/applications/appinfo/AppHeaderViewPreferenceControllerTest.java

+3 −0
Original line number Diff line number Diff line
@@ -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