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

Commit ad1a789a authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Ensure icons on app filtering page" into tm-dev

parents 78d917cc de08d984

src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceController.java

+2 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import androidx.preference.PreferenceScreen; 
import com.android.settings.applications.AppStateBaseBridge;

import com.android.settings.core.BasePreferenceController;

import com.android.settings.notification.NotificationBackend;

import com.android.settingslib.applications.AppUtils;

import com.android.settingslib.applications.ApplicationsState;

import com.android.settingslib.applications.ApplicationsState.AppEntry;

import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -128,7 +129,7 @@ public class BridgedAppsPreferenceController extends BasePreferenceController im 
            CheckBoxPreference preference = mScreen.findPreference(prefKey);

            if (preference == null) {

                preference = new CheckBoxPreference(mScreen.getContext());

                preference.setIcon(entry.icon);

                preference.setIcon(AppUtils.getIcon(mContext, entry));

                preference.setTitle(entry.label);

                preference.setKey(prefKey);

                mScreen.addPreference(preference);

tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceControllerTest.java

+2 −4
Original line number Diff line number Diff line
@@ -30,7 +30,6 @@ import android.content.ComponentName; 
import android.content.Context;

import android.content.pm.ApplicationInfo;

import android.content.pm.VersionedPackage;

import android.graphics.drawable.Drawable;

import android.os.Looper;

import android.service.notification.NotificationListenerFilter;

import android.util.ArraySet;
@@ -65,6 +64,7 @@ public class BridgedAppsPreferenceControllerTest { 
    PreferenceScreen mScreen;

    @Mock

    ApplicationsState mAppState;



    private ApplicationsState.AppEntry mAppEntry;

    private ApplicationsState.AppEntry mAppEntry2;
@@ -92,8 +92,6 @@ public class BridgedAppsPreferenceControllerTest { 


        mAppEntry.info = ai;

        mAppEntry.label = "hi";

        Drawable icon = mock(Drawable.class);

        mAppEntry.icon = icon;



        mController = new BridgedAppsPreferenceController(mContext, "key");

        mController.setCn(mCn);
@@ -167,7 +165,7 @@ public class BridgedAppsPreferenceControllerTest { 


        assertThat(actual.isChecked()).isTrue();

        assertThat(actual.getTitle()).isEqualTo("hi");

        assertThat(actual.getIcon()).isEqualTo(mAppEntry.icon);

        assertThat(actual.getIcon()).isNotNull();

    }



    @Test