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

Limit the number of permissions being displayed.

Browse Source 
am: 922064ed69

Change-Id: I55fcc111d5d67e0e67c327894abb7fa9150c5346
This commit is contained in:
Yi-Ling Chuang
2019-05-06 10:27:32 -07:00
committed by android-build-merger
parent fa2074562f 922064ed69
commit 6e167068fb
2 changed files with 37 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/applications/AppPermissionsPreferenceController.java
View File

@@ -35,6 +35,9 @@ public class AppPermissionsPreferenceController extends BasePreferenceController
private static final String TAG = "AppPermissionPrefCtrl";
private static int NUM_PACKAGE_TO_CHECK = 3;
@VisibleForTesting
static int NUM_PERMISSIONS_TO_SHOW = 3;
private final PackageManager mPackageManager;
private final Set<CharSequence> mPermissionGroups;
@@ -95,9 +98,13 @@ public class AppPermissionsPreferenceController extends BasePreferenceController
if (mNumPackageChecked < NUM_PACKAGE_TO_CHECK) {
return;
}
final CharSequence summary = !mPermissionGroups.isEmpty()
final List<CharSequence> permissionsToShow = mPermissionGroups.stream()
.limit(NUM_PERMISSIONS_TO_SHOW)
.collect(Collectors.toList());
final CharSequence summary = !permissionsToShow.isEmpty()
? mContext.getString(R.string.app_permissions_summary,
ListFormatter.getInstance().format(mPermissionGroups).toLowerCase())
ListFormatter.getInstance().format(permissionsToShow).toLowerCase())
: null;
mPreference.setSummary(summary);
}

30
tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
View File

@@ -16,6 +16,8 @@
package com.android.settings.applications;
import static com.android.settings.applications.AppPermissionsPreferenceController.NUM_PERMISSIONS_TO_SHOW;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.anyString;
@@ -32,11 +34,11 @@ import androidx.preference.Preference;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
import java.util.ArrayList;
import java.util.List;
@RunWith(RobolectricTestRunner.class)
public class AppPermissionsPreferenceControllerTest {
@@ -47,7 +49,6 @@ public class AppPermissionsPreferenceControllerTest {
@Before
public void setUp() throws NameNotFoundException {
MockitoAnnotations.initMocks(this);
mContext = RuntimeEnvironment.application;
mPreference = spy(new Preference(mContext));
mController = spy(new AppPermissionsPreferenceController(mContext, "pref_key"));
@@ -106,4 +107,29 @@ public class AppPermissionsPreferenceControllerTest {
verify(mPreference, never()).setSummary(anyString());
}
@Test
public void updateSummary_hasFiveItems_shouldShowCertainNumItems() {
doNothing().when(mController).queryPermissionSummary();
mController.updateState(mPreference);
mController.mNumPackageChecked = 2;
mController.updateSummary(getPermissionGroupsSet());
final CharSequence summary = mPreference.getSummary();
final int items = summary.toString().split(",").length;
assertThat(items).isEqualTo(NUM_PERMISSIONS_TO_SHOW);
}
private List<CharSequence> getPermissionGroupsSet() {
final List<CharSequence> labels = new ArrayList<>();
labels.add("Phone");
labels.add("SMS");
labels.add("Microphone");
labels.add("Contacts");
labels.add("Camera");
labels.add("Location");
return labels;
}
}