From a9693524bf92e4b67915476699b9325bd23cb883 Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Wed, 13 Sep 2017 15:23:06 -0700 Subject: [PATCH] Change the permission labels to lowercase. In the summary for Apps permissions, change the list of permissions lable to lowercase instead. Change-Id: I5b3133c33de7110dbec6ab179c6f1308c4ed481e Fixes: 65049565 Test: make RunSettingsRoboTests --- .../AppPermissionsPreferenceController.java | 2 +- .../AppPermissionsPreferenceControllerTest.java | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/com/android/settings/applications/AppPermissionsPreferenceController.java b/src/com/android/settings/applications/AppPermissionsPreferenceController.java index f6a2271732b..c8ff381165c 100644 --- a/src/com/android/settings/applications/AppPermissionsPreferenceController.java +++ b/src/com/android/settings/applications/AppPermissionsPreferenceController.java @@ -111,7 +111,7 @@ public class AppPermissionsPreferenceController extends AbstractPreferenceContro } private CharSequence concatSummaryText(CharSequence currentSummary, String permission) { - final CharSequence label = getPermissionGroupLabel(permission); + final String label = getPermissionGroupLabel(permission).toString().toLowerCase(); if (TextUtils.isEmpty(currentSummary)) { return label; } diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java index e19c52f2204..2e522142290 100644 --- a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java @@ -178,33 +178,33 @@ public class AppPermissionsPreferenceControllerTest { permissions[2] = mPermCamera; permissions[3] = mPermSms; mController.updateState(mPreference); - verify(mPreference).setSummary("Apps using Location, Microphone, Camera"); + verify(mPreference).setSummary("Apps using location, microphone, camera"); permissions[0] = mPermPhone; permissions[1] = mPermMic; permissions[2] = mPermCamera; permissions[3] = mPermSms; mController.updateState(mPreference); - verify(mPreference).setSummary("Apps using Microphone, Camera, Sms"); + verify(mPreference).setSummary("Apps using microphone, camera, sms"); permissions[0] = mPermPhone; permissions[1] = mPermMic; permissions[2] = mPermContacts; permissions[3] = mPermSms; mController.updateState(mPreference); - verify(mPreference).setSummary("Apps using Microphone, Sms, Contacts"); + verify(mPreference).setSummary("Apps using microphone, sms, contacts"); permissions = new PermissionInfo[2]; info.permissions = permissions; permissions[0] = mPermLocation; permissions[1] = mPermCamera; mController.updateState(mPreference); - verify(mPreference).setSummary("Apps using Location, Camera"); + verify(mPreference).setSummary("Apps using location, camera"); permissions = new PermissionInfo[1]; info.permissions = permissions; permissions[0] = mPermCamera; mController.updateState(mPreference); - verify(mPreference).setSummary("Apps using Camera"); + verify(mPreference).setSummary("Apps using camera"); } }