diff --git a/res/values/strings.xml b/res/values/strings.xml index 44df9df95d3..645a8264b98 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -8024,6 +8024,8 @@ Change settings for each app that sends notifications Apps shown on device This app doesn\u2019t support enhanced settings + More settings + More settings are available inside this app VR helper services diff --git a/res/xml/notification_access_permission_details.xml b/res/xml/notification_access_permission_details.xml index 9867b6d4c0a..32a79e8ee36 100644 --- a/res/xml/notification_access_permission_details.xml +++ b/res/xml/notification_access_permission_details.xml @@ -64,6 +64,12 @@ settings:searchable="false" settings:controller="com.android.settings.applications.specialaccess.notificationaccess.BridgedAppsLinkPreferenceController" /> + + resolveInfos = mPm.queryIntentActivities( + mIntent, + PackageManager.ResolveInfoFlags.of(0)); + if (resolveInfos == null || resolveInfos.isEmpty()) { + return CONDITIONALLY_UNAVAILABLE; + } + return AVAILABLE; + } + + @Override + public String getPreferenceKey() { + return KEY_MORE_SETTINGS; + } + + public MoreSettingsPreferenceController setPackageManager(PackageManager pm) { + mPm = pm; + return this; + } + + public MoreSettingsPreferenceController setPackage(String pkg) { + mPackage = pkg; + mIntent.setPackage(mPackage); + return this; + } + + public void updateState(Preference preference) { + preference.setIntent(mIntent); + } +} diff --git a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java index e6feebb92ab..531fb228dcd 100644 --- a/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java +++ b/src/com/android/settings/applications/specialaccess/notificationaccess/NotificationAccessDetails.java @@ -124,6 +124,9 @@ public class NotificationAccessDetails extends DashboardFragment { .setCn(mComponentName) .setUserId(mUserId) .setTargetSdk(listenerTargetSdk); + use(MoreSettingsPreferenceController.class) + .setPackage(mComponentName.getPackageName()) + .setPackageManager(mPm); final int finalListenerTargetSdk = listenerTargetSdk; getPreferenceControllers().forEach(controllers -> { controllers.forEach(controller -> { diff --git a/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/MoreSettingsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/MoreSettingsPreferenceControllerTest.java new file mode 100644 index 00000000000..503af46846d --- /dev/null +++ b/tests/unit/src/com/android/settings/applications/specialaccess/notificationaccess/MoreSettingsPreferenceControllerTest.java @@ -0,0 +1,99 @@ +/* + * 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.applications.specialaccess.notificationaccess; + +import static com.android.settings.core.BasePreferenceController.AVAILABLE; +import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE; + +import static com.google.common.truth.Truth.assertThat; + +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyInt; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import android.content.Context; +import android.content.Intent; +import android.content.pm.PackageManager; +import android.content.pm.ResolveInfo; +import android.service.notification.NotificationListenerService; + +import androidx.preference.Preference; +import androidx.test.core.app.ApplicationProvider; +import androidx.test.ext.junit.runners.AndroidJUnit4; + +import com.google.common.collect.ImmutableList; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.ArgumentCaptor; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +@RunWith(AndroidJUnit4.class) +public class MoreSettingsPreferenceControllerTest { + + Context mContext; + private MoreSettingsPreferenceController mController; + @Mock + PackageManager mPm; + final String mPkg = "pkg"; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mContext = ApplicationProvider.getApplicationContext(); + + mController = new MoreSettingsPreferenceController(mContext); + mController.setPackage(mPkg); + mController.setPackageManager(mPm); + + } + + @Test + public void getAvailabilityStatus_available() { + ArgumentCaptor captor = ArgumentCaptor.forClass(Intent.class); + when(mPm.queryIntentActivities(captor.capture(), any())).thenReturn( + ImmutableList.of(mock(ResolveInfo.class))); + + assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE); + assertThat(captor.getValue().getPackage()).isEqualTo(mPkg); + assertThat(captor.getValue().getAction()).isEqualTo(Intent.ACTION_MAIN); + assertThat(captor.getValue().getCategories()).contains( + NotificationListenerService.INTENT_CATEGORY_SETTINGS_HOME); + } + + @Test + public void getAvailabilityStatus_notAvailable() { + ArgumentCaptor captor = ArgumentCaptor.forClass(Intent.class); + when(mPm.queryIntentActivities(captor.capture(), any())).thenReturn(ImmutableList.of()); + + assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); + } + + @Test + public void updateState() { + Preference preference = new Preference(mContext); + mController.updateState(preference); + + assertThat(preference.getIntent().getPackage()).isEqualTo(mPkg); + assertThat(preference.getIntent().getAction()).isEqualTo(Intent.ACTION_MAIN); + assertThat(preference.getIntent().getCategories()).contains( + NotificationListenerService.INTENT_CATEGORY_SETTINGS_HOME); + } +}