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

Commit 1eb3dae3 authored by Julia Reynolds's avatar Julia Reynolds Committed by Android (Google) Code Review
Browse files

Merge "Update icon sizing"

parents 3f4a52c6 a50c0b96

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

+3 −2
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.settings.widget.AppCheckBoxPreference;

import com.android.settingslib.applications.AppUtils;

import com.android.settingslib.applications.ApplicationsState;

import com.android.settingslib.applications.ApplicationsState.AppEntry;
@@ -126,9 +127,9 @@ public class BridgedAppsPreferenceController extends BasePreferenceController im 
            final AppEntry entry = apps.get(i);

            final String prefKey = entry.info.packageName + "|" + entry.info.uid;

            appsKeySet.add(prefKey);

            CheckBoxPreference preference = mScreen.findPreference(prefKey);

            AppCheckBoxPreference preference = mScreen.findPreference(prefKey);

            if (preference == null) {

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

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

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

                preference.setTitle(entry.label);

                preference.setKey(prefKey);

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

+5 −5
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ import android.os.Looper; 
import android.service.notification.NotificationListenerFilter;

import android.util.ArraySet;



import androidx.preference.CheckBoxPreference;

import androidx.preference.Preference;

import androidx.preference.PreferenceManager;

import androidx.preference.PreferenceScreen;
@@ -42,6 +41,7 @@ import androidx.test.core.app.ApplicationProvider; 
import androidx.test.ext.junit.runners.AndroidJUnit4;



import com.android.settings.notification.NotificationBackend;

import com.android.settings.widget.AppCheckBoxPreference;

import com.android.settingslib.applications.ApplicationsState;



import org.junit.Before;
@@ -120,7 +120,7 @@ public class BridgedAppsPreferenceControllerTest { 
        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);

        when(mNm.getListenerFilter(mCn, 0)).thenReturn(new NotificationListenerFilter());



        CheckBoxPreference p = mock(CheckBoxPreference.class);

        AppCheckBoxPreference p = mock(AppCheckBoxPreference.class);

        when(p.getKey()).thenReturn("pkg|12300");

        mScreen.addPreference(p);
@@ -161,7 +161,7 @@ public class BridgedAppsPreferenceControllerTest { 


        mController.onRebuildComplete(entries);



        CheckBoxPreference actual = mScreen.findPreference("pkg|12300");

        AppCheckBoxPreference actual = mScreen.findPreference("pkg|12300");



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

        assertThat(actual.getTitle()).isEqualTo("hi");
@@ -178,7 +178,7 @@ public class BridgedAppsPreferenceControllerTest { 
        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);

        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);



        CheckBoxPreference pref = new CheckBoxPreference(mContext);

        AppCheckBoxPreference pref = new AppCheckBoxPreference(mContext);

        pref.setKey("pkg|567");



        mController.onPreferenceChange(pref, false);
@@ -204,7 +204,7 @@ public class BridgedAppsPreferenceControllerTest { 
        when(mNm.isNotificationListenerAccessGranted(mCn)).thenReturn(true);

        when(mNm.getListenerFilter(mCn, 0)).thenReturn(nlf);



        CheckBoxPreference pref = new CheckBoxPreference(mContext);

        AppCheckBoxPreference pref = new AppCheckBoxPreference(mContext);

        pref.setKey("pkg|567");



        mController.onPreferenceChange(pref, true);