Loading src/com/android/settings/spa/app/appinfo/AppPermissionPreference.kt +11 −6 Original line number Diff line number Diff line Loading @@ -27,6 +27,7 @@ import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.lifecycle.LiveData import com.android.settings.R import com.android.settingslib.spa.widget.preference.Preference import com.android.settingslib.spa.widget.preference.PreferenceModel Loading @@ -36,13 +37,17 @@ private const val TAG = "AppPermissionPreference" private const val EXTRA_HIDE_INFO_BUTTON = "hideInfoButton" @Composable fun AppPermissionPreference(app: ApplicationInfo) { fun AppPermissionPreference( app: ApplicationInfo, summaryLiveData: LiveData<AppPermissionSummaryState> = rememberAppPermissionSummary(app), ) { val context = LocalContext.current val summaryLiveData = remember { AppPermissionSummaryLiveData(context, app) } val summaryState = summaryLiveData.observeAsState(initial = AppPermissionSummaryState( val summaryState = summaryLiveData.observeAsState( initial = AppPermissionSummaryState( summary = stringResource(R.string.summary_placeholder), enabled = false, )) ) ) Preference( model = remember { object : PreferenceModel { Loading src/com/android/settings/spa/app/appinfo/AppPermissionSummary.kt +9 −0 Original line number Diff line number Diff line Loading @@ -20,6 +20,9 @@ import android.content.Context import android.content.pm.ApplicationInfo import android.content.pm.PackageManager.OnPermissionsChangedListener import android.icu.text.ListFormatter import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import androidx.lifecycle.LiveData import com.android.settings.R import com.android.settingslib.applications.PermissionsSummaryHelper Loading @@ -33,6 +36,12 @@ data class AppPermissionSummaryState( val enabled: Boolean, ) @Composable fun rememberAppPermissionSummary(app: ApplicationInfo): AppPermissionSummaryLiveData { val context = LocalContext.current return remember { AppPermissionSummaryLiveData(context, app) } } class AppPermissionSummaryLiveData( private val context: Context, private val app: ApplicationInfo, Loading tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppPermissionPreferenceTest.kt 0 → 100644 +106 −0 Original line number Diff line number Diff line /* * Copyright (C) 2023 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.spa.app.appinfo import android.content.Context import android.content.Intent import android.content.pm.ApplicationInfo import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.onRoot import androidx.compose.ui.test.performClick import androidx.lifecycle.MutableLiveData import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.settings.R import com.android.settingslib.spa.testutils.delay import com.android.settingslib.spaprivileged.model.app.userHandle import com.google.common.truth.Truth.assertThat import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.Mockito.any import org.mockito.Mockito.doNothing import org.mockito.Mockito.eq import org.mockito.Mockito.verify import org.mockito.Spy import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule @RunWith(AndroidJUnit4::class) class AppPermissionPreferenceTest { @get:Rule val composeTestRule = createComposeRule() @get:Rule val mockito: MockitoRule = MockitoJUnit.rule() @Spy private val context: Context = ApplicationProvider.getApplicationContext() @Test fun title_display() { setContent() composeTestRule.onNodeWithText(context.getString(R.string.permissions_label)) .assertIsDisplayed() } @Test fun whenClick_startActivity() { doNothing().`when`(context).startActivityAsUser(any(), any()) setContent() composeTestRule.onRoot().performClick() composeTestRule.delay() val intentCaptor = ArgumentCaptor.forClass(Intent::class.java) verify(context).startActivityAsUser(intentCaptor.capture(), eq(APP.userHandle)) val intent = intentCaptor.value assertThat(intent.action).isEqualTo(Intent.ACTION_MANAGE_APP_PERMISSIONS) assertThat(intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME)).isEqualTo(PACKAGE_NAME) assertThat(intent.getBooleanExtra(EXTRA_HIDE_INFO_BUTTON, false)).isEqualTo(true) } private fun setContent() { composeTestRule.setContent { CompositionLocalProvider(LocalContext provides context) { AppPermissionPreference( app = APP, summaryLiveData = MutableLiveData( AppPermissionSummaryState(summary = SUMMARY, enabled = true) ), ) } } composeTestRule.delay() } private companion object { const val PACKAGE_NAME = "package.name" const val SUMMARY = "Summary" private const val EXTRA_HIDE_INFO_BUTTON = "hideInfoButton" val APP = ApplicationInfo().apply { packageName = PACKAGE_NAME } } } No newline at end of file Loading
src/com/android/settings/spa/app/appinfo/AppPermissionPreference.kt +11 −6 Original line number Diff line number Diff line Loading @@ -27,6 +27,7 @@ import androidx.compose.runtime.livedata.observeAsState import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.res.stringResource import androidx.lifecycle.LiveData import com.android.settings.R import com.android.settingslib.spa.widget.preference.Preference import com.android.settingslib.spa.widget.preference.PreferenceModel Loading @@ -36,13 +37,17 @@ private const val TAG = "AppPermissionPreference" private const val EXTRA_HIDE_INFO_BUTTON = "hideInfoButton" @Composable fun AppPermissionPreference(app: ApplicationInfo) { fun AppPermissionPreference( app: ApplicationInfo, summaryLiveData: LiveData<AppPermissionSummaryState> = rememberAppPermissionSummary(app), ) { val context = LocalContext.current val summaryLiveData = remember { AppPermissionSummaryLiveData(context, app) } val summaryState = summaryLiveData.observeAsState(initial = AppPermissionSummaryState( val summaryState = summaryLiveData.observeAsState( initial = AppPermissionSummaryState( summary = stringResource(R.string.summary_placeholder), enabled = false, )) ) ) Preference( model = remember { object : PreferenceModel { Loading
src/com/android/settings/spa/app/appinfo/AppPermissionSummary.kt +9 −0 Original line number Diff line number Diff line Loading @@ -20,6 +20,9 @@ import android.content.Context import android.content.pm.ApplicationInfo import android.content.pm.PackageManager.OnPermissionsChangedListener import android.icu.text.ListFormatter import androidx.compose.runtime.Composable import androidx.compose.runtime.remember import androidx.compose.ui.platform.LocalContext import androidx.lifecycle.LiveData import com.android.settings.R import com.android.settingslib.applications.PermissionsSummaryHelper Loading @@ -33,6 +36,12 @@ data class AppPermissionSummaryState( val enabled: Boolean, ) @Composable fun rememberAppPermissionSummary(app: ApplicationInfo): AppPermissionSummaryLiveData { val context = LocalContext.current return remember { AppPermissionSummaryLiveData(context, app) } } class AppPermissionSummaryLiveData( private val context: Context, private val app: ApplicationInfo, Loading
tests/spa_unit/src/com/android/settings/spa/app/appinfo/AppPermissionPreferenceTest.kt 0 → 100644 +106 −0 Original line number Diff line number Diff line /* * Copyright (C) 2023 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.spa.app.appinfo import android.content.Context import android.content.Intent import android.content.pm.ApplicationInfo import androidx.compose.runtime.CompositionLocalProvider import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.test.assertIsDisplayed import androidx.compose.ui.test.junit4.createComposeRule import androidx.compose.ui.test.onNodeWithText import androidx.compose.ui.test.onRoot import androidx.compose.ui.test.performClick import androidx.lifecycle.MutableLiveData import androidx.test.core.app.ApplicationProvider import androidx.test.ext.junit.runners.AndroidJUnit4 import com.android.settings.R import com.android.settingslib.spa.testutils.delay import com.android.settingslib.spaprivileged.model.app.userHandle import com.google.common.truth.Truth.assertThat import org.junit.Rule import org.junit.Test import org.junit.runner.RunWith import org.mockito.ArgumentCaptor import org.mockito.Mockito.any import org.mockito.Mockito.doNothing import org.mockito.Mockito.eq import org.mockito.Mockito.verify import org.mockito.Spy import org.mockito.junit.MockitoJUnit import org.mockito.junit.MockitoRule @RunWith(AndroidJUnit4::class) class AppPermissionPreferenceTest { @get:Rule val composeTestRule = createComposeRule() @get:Rule val mockito: MockitoRule = MockitoJUnit.rule() @Spy private val context: Context = ApplicationProvider.getApplicationContext() @Test fun title_display() { setContent() composeTestRule.onNodeWithText(context.getString(R.string.permissions_label)) .assertIsDisplayed() } @Test fun whenClick_startActivity() { doNothing().`when`(context).startActivityAsUser(any(), any()) setContent() composeTestRule.onRoot().performClick() composeTestRule.delay() val intentCaptor = ArgumentCaptor.forClass(Intent::class.java) verify(context).startActivityAsUser(intentCaptor.capture(), eq(APP.userHandle)) val intent = intentCaptor.value assertThat(intent.action).isEqualTo(Intent.ACTION_MANAGE_APP_PERMISSIONS) assertThat(intent.getStringExtra(Intent.EXTRA_PACKAGE_NAME)).isEqualTo(PACKAGE_NAME) assertThat(intent.getBooleanExtra(EXTRA_HIDE_INFO_BUTTON, false)).isEqualTo(true) } private fun setContent() { composeTestRule.setContent { CompositionLocalProvider(LocalContext provides context) { AppPermissionPreference( app = APP, summaryLiveData = MutableLiveData( AppPermissionSummaryState(summary = SUMMARY, enabled = true) ), ) } } composeTestRule.delay() } private companion object { const val PACKAGE_NAME = "package.name" const val SUMMARY = "Summary" private const val EXTRA_HIDE_INFO_BUTTON = "hideInfoButton" val APP = ApplicationInfo().apply { packageName = PACKAGE_NAME } } } No newline at end of file