PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16990584

Change-Id: I1c1405244855e9cc1ad5cd4026f2abf8a16a3413
This commit is contained in:
TreeHugger Robot
2022-02-23 20:33:01 +00:00
committed by Automerger Merge Worker
parent 9703570e85 ad1a789a86
commit 0b603a3d4e
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/com/android/settings/applications/specialaccess/notificationaccess/BridgedAppsPreferenceController.java
View File

@@ -25,6 +25,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.applications.AppStateBaseBridge; import com.android.settings.applications.AppStateBaseBridge;
import com.android.settings.core.BasePreferenceController; import com.android.settings.core.BasePreferenceController;
import com.android.settings.notification.NotificationBackend; import com.android.settings.notification.NotificationBackend;
import com.android.settingslib.applications.AppUtils;
import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.applications.ApplicationsState.AppEntry; import com.android.settingslib.applications.ApplicationsState.AppEntry;
import com.android.settingslib.applications.ApplicationsState.AppFilter; import com.android.settingslib.applications.ApplicationsState.AppFilter;
@@ -128,7 +129,7 @@ public class BridgedAppsPreferenceController extends BasePreferenceController im
CheckBoxPreference preference = mScreen.findPreference(prefKey); CheckBoxPreference preference = mScreen.findPreference(prefKey);
if (preference == null) { if (preference == null) {
preference = new CheckBoxPreference(mScreen.getContext()); preference = new CheckBoxPreference(mScreen.getContext());
preference.setIcon(entry.icon); preference.setIcon(AppUtils.getIcon(mContext, entry));
preference.setTitle(entry.label); preference.setTitle(entry.label);
preference.setKey(prefKey); preference.setKey(prefKey);
mScreen.addPreference(preference); mScreen.addPreference(preference);

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

@@ -30,7 +30,6 @@ import android.content.ComponentName;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.VersionedPackage; import android.content.pm.VersionedPackage;
import android.graphics.drawable.Drawable;
import android.os.Looper; import android.os.Looper;
import android.service.notification.NotificationListenerFilter; import android.service.notification.NotificationListenerFilter;
import android.util.ArraySet; import android.util.ArraySet;
@@ -65,6 +64,7 @@ public class BridgedAppsPreferenceControllerTest {
PreferenceScreen mScreen; PreferenceScreen mScreen;
@Mock @Mock
ApplicationsState mAppState; ApplicationsState mAppState;
private ApplicationsState.AppEntry mAppEntry; private ApplicationsState.AppEntry mAppEntry;
private ApplicationsState.AppEntry mAppEntry2; private ApplicationsState.AppEntry mAppEntry2;
@@ -92,8 +92,6 @@ public class BridgedAppsPreferenceControllerTest {
mAppEntry.info = ai; mAppEntry.info = ai;
mAppEntry.label = "hi"; mAppEntry.label = "hi";
Drawable icon = mock(Drawable.class);
mAppEntry.icon = icon;
mController = new BridgedAppsPreferenceController(mContext, "key"); mController = new BridgedAppsPreferenceController(mContext, "key");
mController.setCn(mCn); mController.setCn(mCn);
@@ -167,7 +165,7 @@ public class BridgedAppsPreferenceControllerTest {
assertThat(actual.isChecked()).isTrue(); assertThat(actual.isChecked()).isTrue();
assertThat(actual.getTitle()).isEqualTo("hi"); assertThat(actual.getTitle()).isEqualTo("hi");
assertThat(actual.getIcon()).isEqualTo(mAppEntry.icon); assertThat(actual.getIcon()).isNotNull();
} }
@Test @Test