commit a9693524bf92e4b67915476699b9325bd23cb883
author Doris Ling <dling@google.com> Wed Sep 13 15:23:06 2017 -0700
committer Doris Ling <dling@google.com> Wed Sep 13 15:23:06 2017 -0700
tree 2abb4e8b75851b15fd84be5226ce99cf6f4fde24
parent b0b1b9364c649751bb9bb2f7f922ffb50c64762b

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

src/com/android/settings/applications/AppPermissionsPreferenceController.java

diff --git a/src/com/android/settings/applications/AppPermissionsPreferenceController.java b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
index f6a2271..c8ff381 100644
--- a/src/com/android/settings/applications/AppPermissionsPreferenceController.java
+++ b/src/com/android/settings/applications/AppPermissionsPreferenceController.java
@@ -111,7 +111,7 @@
     }
 
     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;
         }

tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java

diff --git a/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/applications/AppPermissionsPreferenceControllerTest.java
index e19c52f..2e52214 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 @@
         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");
     }
 }