Settings: Convert AppOps array items to string references

* Avoid future breakage
 This will need conversion of all AOSP translated arrays to strings

Change-Id: I2e52e4013d1232d529ce5b9e3aae3502c42e938a

diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index f06b1e1..e5f1988 100644 (file)
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -683,30 +683,65 @@
         <item>monitor high power location</item>
         <item>get usage stats</item>
         <item>mute/unmute microphone</item>
-        <item>toast window</item>
         <item>project media</item>
         <item>activate VPN</item>
         <item>write wallpaper</item>
         <item>assist structure</item>
         <item>assist screenshot</item>
-        <item>read phone state</item>
-        <item>add voicemail</item>
-        <item>use sip</item>
-        <item>make call</item>
-        <item>use fingerprint</item>
-        <item>use body sensors</item>
-        <item>read cell broadcast</item>
-        <item>mock location</item>
-        <item>read external storage</item>
-        <item>write external storage</item>
-        <item>turn screen on</item>
-        <item>get accounts</item>
-        <item>toggle wi-fi</item>
-        <item>toggle bluetooth</item>
-        <item>start at boot</item>
-        <item>toggle nfc</item>
-        <item>change mobile data</item>
-        <item>superuser</item>
+    </string-array>
+
+    <!-- User display names for app ops codes -->
+    <string-array name="app_ops_labels">
+        <item>Location</item>
+        <item>Location</item>
+        <item>Location</item>
+        <item>Vibrate</item>
+        <item>Read contacts</item>
+        <item>Modify contacts</item>
+        <item>Read call log</item>
+        <item>Modify call log</item>
+        <item>Read calendar</item>
+        <item>Modify calendar</item>
+        <item>Location</item>
+        <item>Post notification</item>
+        <item>Location</item>
+        <item>Call phone</item>
+        <item>Read SMS/MMS</item>
+        <item>Write SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Receive SMS/MMS</item>
+        <item>Send SMS/MMS</item>
+        <item>Read SMS/MMS</item>
+        <item>Write SMS/MMS</item>
+        <item>Modify settings</item>
+        <item>Draw on top</item>
+        <item>Access notifications</item>
+        <item>Camera</item>
+        <item>Record audio</item>
+        <item>Play audio</item>
+        <item>Read clipboard</item>
+        <item>Modify clipboard</item>
+        <item>Media buttons</item>
+        <item>Audio focus</item>
+        <item>Master volume</item>
+        <item>Voice volume</item>
+        <item>Ring volume</item>
+        <item>Media volume</item>
+        <item>Alarm volume</item>
+        <item>Notification volume</item>
+        <item>Bluetooth volume</item>
+        <item>Keep awake</item>
+        <item>Location</item>
+        <item>Location</item>
+        <item>Get usage stats</item>
+        <item>Mute/unmute microphone</item>
+        <item>Project media</item>
+        <item>Activate VPN</item>
+        <item>Write wallpaper</item>
+        <item>Assist structure</item>
+        <item>Assist screenshot</item>
     </string-array>
 
     <!-- Titles for the list of long press timeout options. -->

diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index c331a00..cdd81ca 100644 (file)
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -222,7 +222,7 @@
         <item>@string/hardware_keys_action_last_app</item>
     </string-array>
 
-    <!-- Names of categories of app ops tabs -->
+    <!-- Names of categories of app ops tabs - extension of AOSP -->
     <string-array name="app_ops_categories_cm" translatable="false">
         <item>@string/app_ops_categories_location</item>
         <item>@string/app_ops_categories_personal</item>
@@ -233,6 +233,152 @@
         <item>@string/app_ops_categories_su</item>
     </string-array>
 
+    <!-- User display names for app ops codes - extension of AOSP -->
+    <string-array name="app_ops_summaries_cm" translatable="false">
+        <item>@string/app_ops_summaries_coarse_location</item>
+        <item>@string/app_ops_summaries_fine_location</item>
+        <item>@string/app_ops_summaries_gps</item>
+        <item>@string/app_ops_summaries_vibrate</item>
+        <item>@string/app_ops_summaries_read_contacts</item>
+        <item>@string/app_ops_summaries_modify_contacts</item>
+        <item>@string/app_ops_summaries_read_call_log</item>
+        <item>@string/app_ops_summaries_modify_call_log</item>
+        <item>@string/app_ops_summaries_read_calendar</item>
+        <item>@string/app_ops_summaries_modify_calendar</item>
+        <item>@string/app_ops_summaries_wifi_scan</item>
+        <item>@string/app_ops_summaries_notification</item>
+        <item>@string/app_ops_summaries_cell_scan</item>
+        <item>@string/app_ops_summaries_call_phone</item>
+        <item>@string/app_ops_summaries_read_sms</item>
+        <item>@string/app_ops_summaries_write_sms</item>
+        <item>@string/app_ops_summaries_receive_sms</item>
+        <item>@string/app_ops_summaries_receive_emergency_sms</item>
+        <item>@string/app_ops_summaries_receive_mms</item>
+        <item>@string/app_ops_summaries_receive_wap_push</item>
+        <item>@string/app_ops_summaries_send_sms</item>
+        <item>@string/app_ops_summaries_read_icc_sms</item>
+        <item>@string/app_ops_summaries_write_icc_sms</item>
+        <item>@string/app_ops_summaries_modify_settings</item>
+        <item>@string/app_ops_summaries_draw_on_top</item>
+        <item>@string/app_ops_summaries_access_notifications</item>
+        <item>@string/app_ops_summaries_camera</item>
+        <item>@string/app_ops_summaries_record_audio</item>
+        <item>@string/app_ops_summaries_play_audio</item>
+        <item>@string/app_ops_summaries_read_clipboard</item>
+        <item>@string/app_ops_summaries_modify_clipboard</item>
+        <item>@string/app_ops_summaries_media_buttons</item>
+        <item>@string/app_ops_summaries_audio_focus</item>
+        <item>@string/app_ops_summaries_master_volume</item>
+        <item>@string/app_ops_summaries_voice_volume</item>
+        <item>@string/app_ops_summaries_ring_volume</item>
+        <item>@string/app_ops_summaries_media_volume</item>
+        <item>@string/app_ops_summaries_alarm_volume</item>
+        <item>@string/app_ops_summaries_notification_volume</item>
+        <item>@string/app_ops_summaries_bluetooth_volume</item>
+        <item>@string/app_ops_summaries_keep_awake</item>
+        <item>@string/app_ops_summaries_monitor_location</item>
+        <item>@string/app_ops_summaries_monitor_high_power_location</item>
+        <item>@string/app_ops_summaries_get_usage_stats</item>
+        <item>@string/app_ops_summaries_mute_unmute_microphone</item>
+        <item>@string/app_ops_summaries_toast_window</item>
+        <item>@string/app_ops_summaries_project_media</item>
+        <item>@string/app_ops_summaries_activate_vpn</item>
+        <item>@string/app_ops_summaries_write_wallpaper</item>
+        <item>@string/app_ops_summaries_assist_structure</item>
+        <item>@string/app_ops_summaries_assist_screenshot</item>
+        <item>@string/app_ops_summaries_read_phone_state</item>
+        <item>@string/app_ops_summaries_add_voicemail</item>
+        <item>@string/app_ops_summaries_use_sip</item>
+        <item>@string/app_ops_summaries_make_call</item>
+        <item>@string/app_ops_summaries_use_fingerprint</item>
+        <item>@string/app_ops_summaries_use_body_sensors</item>
+        <item>@string/app_ops_summaries_read_cell_broadcasts</item>
+        <item>@string/app_ops_summaries_mock_location</item>
+        <item>@string/app_ops_summaries_read_external_storage</item>
+        <item>@string/app_ops_summaries_write_external_storage</item>
+        <item>@string/app_ops_summaries_turn_screen_on</item>
+        <item>@string/app_ops_summaries_get_accounts</item>
+        <item>@string/app_ops_summaries_toggle_wifi</item>
+        <item>@string/app_ops_summaries_toggle_bluetooth</item>
+        <item>@string/app_ops_summaries_start_at_boot</item>
+        <item>@string/app_ops_summaries_toggle_nfc</item>
+        <item>@string/app_ops_summaries_toggle_mobile_data</item>
+        <item>@string/app_ops_summaries_superuser</item>
+    </string-array>
+
+    <!-- User display names for app ops codes - extension of AOSP -->
+    <string-array name="app_ops_labels_cm" translatable="false">
+        <item>@string/app_ops_labels_coarse_location</item>
+        <item>@string/app_ops_labels_fine_location</item>
+        <item>@string/app_ops_labels_gps</item>
+        <item>@string/app_ops_labels_vibrate</item>
+        <item>@string/app_ops_labels_read_contacts</item>
+        <item>@string/app_ops_labels_modify_contacts</item>
+        <item>@string/app_ops_labels_read_call_log</item>
+        <item>@string/app_ops_labels_modify_call_log</item>
+        <item>@string/app_ops_labels_read_calendar</item>
+        <item>@string/app_ops_labels_modify_calendar</item>
+        <item>@string/app_ops_labels_wifi_scan</item>
+        <item>@string/app_ops_labels_notification</item>
+        <item>@string/app_ops_labels_cell_scan</item>
+        <item>@string/app_ops_labels_call_phone</item>
+        <item>@string/app_ops_labels_read_sms</item>
+        <item>@string/app_ops_labels_write_sms</item>
+        <item>@string/app_ops_labels_receive_sms</item>
+        <item>@string/app_ops_labels_receive_emergency_sms</item>
+        <item>@string/app_ops_labels_receive_mms</item>
+        <item>@string/app_ops_labels_receive_wap_push</item>
+        <item>@string/app_ops_labels_send_sms</item>
+        <item>@string/app_ops_labels_read_icc_sms</item>
+        <item>@string/app_ops_labels_write_icc_sms</item>
+        <item>@string/app_ops_labels_modify_settings</item>
+        <item>@string/app_ops_labels_draw_on_top</item>
+        <item>@string/app_ops_labels_access_notifications</item>
+        <item>@string/app_ops_labels_camera</item>
+        <item>@string/app_ops_labels_record_audio</item>
+        <item>@string/app_ops_labels_play_audio</item>
+        <item>@string/app_ops_labels_read_clipboard</item>
+        <item>@string/app_ops_labels_modify_clipboard</item>
+        <item>@string/app_ops_labels_media_buttons</item>
+        <item>@string/app_ops_labels_audio_focus</item>
+        <item>@string/app_ops_labels_master_volume</item>
+        <item>@string/app_ops_labels_voice_volume</item>
+        <item>@string/app_ops_labels_ring_volume</item>
+        <item>@string/app_ops_labels_media_volume</item>
+        <item>@string/app_ops_labels_alarm_volume</item>
+        <item>@string/app_ops_labels_notification_volume</item>
+        <item>@string/app_ops_labels_bluetooth_volume</item>
+        <item>@string/app_ops_labels_keep_awake</item>
+        <item>@string/app_ops_labels_monitor_location</item>
+        <item>@string/app_ops_labels_monitor_high_power_location</item>
+        <item>@string/app_ops_labels_get_usage_stats</item>
+        <item>@string/app_ops_labels_mute_unmute_microphone</item>
+        <item>@string/app_ops_labels_toast_window</item>
+        <item>@string/app_ops_labels_project_media</item>
+        <item>@string/app_ops_labels_activate_vpn</item>
+        <item>@string/app_ops_labels_write_wallpaper</item>
+        <item>@string/app_ops_labels_assist_structure</item>
+        <item>@string/app_ops_labels_assist_screenshot</item>
+        <item>@string/app_ops_labels_read_phone_state</item>
+        <item>@string/app_ops_labels_add_voicemail</item>
+        <item>@string/app_ops_labels_use_sip</item>
+        <item>@string/app_ops_labels_make_call</item>
+        <item>@string/app_ops_labels_use_fingerprint</item>
+        <item>@string/app_ops_labels_use_body_sensors</item>
+        <item>@string/app_ops_labels_read_cell_broadcasts</item>
+        <item>@string/app_ops_labels_mock_location</item>
+        <item>@string/app_ops_labels_read_external_storage</item>
+        <item>@string/app_ops_labels_write_external_storage</item>
+        <item>@string/app_ops_labels_turn_screen_on</item>
+        <item>@string/app_ops_labels_get_accounts</item>
+        <item>@string/app_ops_labels_toggle_wifi</item>
+        <item>@string/app_ops_labels_toggle_bluetooth</item>
+        <item>@string/app_ops_labels_start_at_boot</item>
+        <item>@string/app_ops_labels_toggle_nfc</item>
+        <item>@string/app_ops_labels_toggle_mobile_data</item>
+        <item>@string/app_ops_labels_superuser</item>
+    </string-array>
+
     <!-- App ops permissions -->
     <string-array name="app_ops_permissions">
         <item>@string/app_ops_permissions_allowed</item>

diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 61eeec4..90baf4d 100644 (file)
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -334,7 +334,7 @@
     <string name="adb_notify">Debugging notify</string>
     <string name="adb_notify_summary">Display a notification when USB or network debugging is enabled</string>
 
-    <!-- App ops categories -->
+    <!-- Names of categories of app ops tabs - extension of AOSP -->
     <string name="app_ops_categories_location">Location</string>
     <string name="app_ops_categories_personal">Personal</string>
     <string name="app_ops_categories_messaging">Messaging</string>
@@ -343,6 +343,148 @@
     <string name="app_ops_categories_bootup">Bootup</string>
     <string name="app_ops_categories_su">Root access</string>
 
+    <!-- User display names for app ops codes - extension of AOSP -->
+    <string name="app_ops_summaries_coarse_location">coarse location</string>
+    <string name="app_ops_summaries_fine_location">fine location</string>
+    <string name="app_ops_summaries_gps">GPS</string>
+    <string name="app_ops_summaries_vibrate">vibrate</string>
+    <string name="app_ops_summaries_read_contacts">read contacts</string>
+    <string name="app_ops_summaries_modify_contacts">modify contacts</string>
+    <string name="app_ops_summaries_read_call_log">read call log</string>
+    <string name="app_ops_summaries_modify_call_log">modify call log</string>
+    <string name="app_ops_summaries_read_calendar">read calendar</string>
+    <string name="app_ops_summaries_modify_calendar">modify calendar</string>
+    <string name="app_ops_summaries_wifi_scan">Wi-Fi scan</string>
+    <string name="app_ops_summaries_notification">notification/toast</string>
+    <string name="app_ops_summaries_cell_scan">cell scan</string>
+    <string name="app_ops_summaries_call_phone">call phone</string>
+    <string name="app_ops_summaries_read_sms">read SMS</string>
+    <string name="app_ops_summaries_write_sms">write SMS</string>
+    <string name="app_ops_summaries_receive_sms">receive SMS</string>
+    <string name="app_ops_summaries_receive_emergency_sms">receive emergency SMS</string>
+    <string name="app_ops_summaries_receive_mms">receive MMS</string>
+    <string name="app_ops_summaries_receive_wap_push">receive WAP push</string>
+    <string name="app_ops_summaries_send_sms">send SMS</string>
+    <string name="app_ops_summaries_read_icc_sms">read ICC SMS</string>
+    <string name="app_ops_summaries_write_icc_sms">write ICC SMS</string>
+    <string name="app_ops_summaries_modify_settings">modify settings</string>
+    <string name="app_ops_summaries_draw_on_top">draw on top</string>
+    <string name="app_ops_summaries_access_notifications">access notifications</string>
+    <string name="app_ops_summaries_camera">camera</string>
+    <string name="app_ops_summaries_record_audio">record audio</string>
+    <string name="app_ops_summaries_play_audio">play audio</string>
+    <string name="app_ops_summaries_read_clipboard">read clipboard</string>
+    <string name="app_ops_summaries_modify_clipboard">modify clipboard</string>
+    <string name="app_ops_summaries_media_buttons">media buttons</string>
+    <string name="app_ops_summaries_audio_focus">audio focus</string>
+    <string name="app_ops_summaries_master_volume">master volume</string>
+    <string name="app_ops_summaries_voice_volume">voice volume</string>
+    <string name="app_ops_summaries_ring_volume">ring volume</string>
+    <string name="app_ops_summaries_media_volume">media volume</string>
+    <string name="app_ops_summaries_alarm_volume">alarm volume</string>
+    <string name="app_ops_summaries_notification_volume">notification volume</string>
+    <string name="app_ops_summaries_bluetooth_volume">bluetooth volume</string>
+    <string name="app_ops_summaries_keep_awake">keep awake</string>
+    <string name="app_ops_summaries_monitor_location">monitor location</string>
+    <string name="app_ops_summaries_monitor_high_power_location">monitor high power location</string>
+    <string name="app_ops_summaries_get_usage_stats">get usage stats</string>
+    <string name="app_ops_summaries_mute_unmute_microphone">mute/unmute microphone</string>
+    <string name="app_ops_summaries_toast_window">display toasts</string>
+    <string name="app_ops_summaries_project_media">project media</string>
+    <string name="app_ops_summaries_activate_vpn">activate VPN</string>
+    <string name="app_ops_summaries_write_wallpaper">write wallpaper</string>
+    <string name="app_ops_summaries_assist_structure">assist structure</string>
+    <string name="app_ops_summaries_assist_screenshot">assist screenshot</string>
+    <string name="app_ops_summaries_read_phone_state">read phone state</string>
+    <string name="app_ops_summaries_add_voicemail">add voicemail</string>
+    <string name="app_ops_summaries_use_sip">use SIP</string>
+    <string name="app_ops_summaries_make_call">make call</string>
+    <string name="app_ops_summaries_use_fingerprint">use fingerprint</string>
+    <string name="app_ops_summaries_use_body_sensors">use body sensors</string>
+    <string name="app_ops_summaries_read_cell_broadcasts">read cell broadcasts</string>
+    <string name="app_ops_summaries_mock_location">mock location</string>
+    <string name="app_ops_summaries_read_external_storage">read external storage</string>
+    <string name="app_ops_summaries_write_external_storage">write to external storage</string>
+    <string name="app_ops_summaries_turn_screen_on">turn screen on</string>
+    <string name="app_ops_summaries_get_accounts">get accounts</string>
+    <string name="app_ops_summaries_toggle_wifi">toggle Wi-Fi</string>
+    <string name="app_ops_summaries_toggle_bluetooth">toggle bluetooth</string>
+    <string name="app_ops_summaries_start_at_boot">start at boot</string>
+    <string name="app_ops_summaries_toggle_nfc">toggle NFC</string>
+    <string name="app_ops_summaries_toggle_mobile_data">toggle mobile data</string>
+    <string name="app_ops_summaries_superuser">root access</string>
+
+    <!-- User display names for app ops codes - extension of AOSP -->
+    <string name="app_ops_labels_coarse_location">Coarse location</string>
+    <string name="app_ops_labels_fine_location">Fine location</string>
+    <string name="app_ops_labels_gps">GPS</string>
+    <string name="app_ops_labels_vibrate">Vibrate</string>
+    <string name="app_ops_labels_read_contacts">Read contacts</string>
+    <string name="app_ops_labels_modify_contacts">Modify contacts</string>
+    <string name="app_ops_labels_read_call_log">Read call log</string>
+    <string name="app_ops_labels_modify_call_log">Modify call log</string>
+    <string name="app_ops_labels_read_calendar">Read calendar</string>
+    <string name="app_ops_labels_modify_calendar">Modify calendar</string>
+    <string name="app_ops_labels_wifi_scan">Wi-Fi scan</string>
+    <string name="app_ops_labels_notification">Notification/Toast</string>
+    <string name="app_ops_labels_cell_scan">Cell scan</string>
+    <string name="app_ops_labels_call_phone">Call phone</string>
+    <string name="app_ops_labels_read_sms">Read SMS</string>
+    <string name="app_ops_labels_write_sms">Write SMS</string>
+    <string name="app_ops_labels_receive_sms">Receive SMS</string>
+    <string name="app_ops_labels_receive_emergency_sms">Receive emergency SMS</string>
+    <string name="app_ops_labels_receive_mms">Receive MMS</string>
+    <string name="app_ops_labels_receive_wap_push">Receive WAP push</string>
+    <string name="app_ops_labels_send_sms">Send SMS</string>
+    <string name="app_ops_labels_read_icc_sms">Read ICC SMS</string>
+    <string name="app_ops_labels_write_icc_sms">Write ICC SMS</string>
+    <string name="app_ops_labels_modify_settings">Modify settings</string>
+    <string name="app_ops_labels_draw_on_top">Draw on top</string>
+    <string name="app_ops_labels_access_notifications">Access notifications</string>
+    <string name="app_ops_labels_camera">Camera</string>
+    <string name="app_ops_labels_record_audio">Record audio</string>
+    <string name="app_ops_labels_play_audio">Play audio</string>
+    <string name="app_ops_labels_read_clipboard">Read clipboard</string>
+    <string name="app_ops_labels_modify_clipboard">Modify clipboard</string>
+    <string name="app_ops_labels_media_buttons">Media buttons</string>
+    <string name="app_ops_labels_audio_focus">Audio focus</string>
+    <string name="app_ops_labels_master_volume">Master volume</string>
+    <string name="app_ops_labels_voice_volume">Voice volume</string>
+    <string name="app_ops_labels_ring_volume">Ring volume</string>
+    <string name="app_ops_labels_media_volume">Media volume</string>
+    <string name="app_ops_labels_alarm_volume">Alarm volume</string>
+    <string name="app_ops_labels_notification_volume">Notification volume</string>
+    <string name="app_ops_labels_bluetooth_volume">Bluetooth volume</string>
+    <string name="app_ops_labels_keep_awake">Keep awake</string>
+    <string name="app_ops_labels_monitor_location">Monitor location</string>
+    <string name="app_ops_labels_monitor_high_power_location">Monitor high power location</string>
+    <string name="app_ops_labels_get_usage_stats">Get usage stats</string>
+    <string name="app_ops_labels_mute_unmute_microphone">Mute/unmute microphone</string>
+    <string name="app_ops_labels_toast_window">Display toasts</string>
+    <string name="app_ops_labels_project_media">Project media</string>
+    <string name="app_ops_labels_activate_vpn">Activate VPN</string>
+    <string name="app_ops_labels_write_wallpaper">Write wallpaper</string>
+    <string name="app_ops_labels_assist_structure">Assist structure</string>
+    <string name="app_ops_labels_assist_screenshot">Assist screenshot</string>
+    <string name="app_ops_labels_read_phone_state">Read phone state</string>
+    <string name="app_ops_labels_add_voicemail">Add voicemail</string>
+    <string name="app_ops_labels_use_sip">Use SIP</string>
+    <string name="app_ops_labels_make_call">Make call</string>
+    <string name="app_ops_labels_use_fingerprint">Use fingerprint</string>
+    <string name="app_ops_labels_use_body_sensors">Use body sensors</string>
+    <string name="app_ops_labels_read_cell_broadcasts">Read cell broadcasts</string>
+    <string name="app_ops_labels_mock_location">Mock location</string>
+    <string name="app_ops_labels_read_external_storage">Read external storage</string>
+    <string name="app_ops_labels_write_external_storage">Write to external storage</string>
+    <string name="app_ops_labels_turn_screen_on">Turn screen on</string>
+    <string name="app_ops_labels_get_accounts">Get accounts</string>
+    <string name="app_ops_labels_toggle_wifi">Toggle Wi-Fi</string>
+    <string name="app_ops_labels_toggle_bluetooth">Toggle bluetooth</string>
+    <string name="app_ops_labels_start_at_boot">Start at boot</string>
+    <string name="app_ops_labels_toggle_nfc">Toggle NFC</string>
+    <string name="app_ops_labels_toggle_mobile_data">Toggle mobile data</string>
+    <string name="app_ops_labels_superuser">Root access</string>
+
     <!-- App ops permissions -->
     <string name="app_ops_permissions_allowed">Allowed</string>
     <string name="app_ops_permissions_ignored">Ignored</string>

diff --git a/src/com/android/settings/applications/AppOpsState.java b/src/com/android/settings/applications/AppOpsState.java
index d035c88..ae58ddd 100644 (file)
--- a/src/com/android/settings/applications/AppOpsState.java
+++ b/src/com/android/settings/applications/AppOpsState.java
@@ -56,8 +56,8 @@ public class AppOpsState {
         mContext = context;
         mAppOps = (AppOpsManager)context.getSystemService(Context.APP_OPS_SERVICE);
         mPm = context.getPackageManager();
-        mOpSummaries = context.getResources().getTextArray(R.array.app_ops_summaries);
-        mOpLabels = context.getResources().getTextArray(com.android.internal.R.array.app_ops_labels);
+        mOpSummaries = context.getResources().getTextArray(R.array.app_ops_summaries_cm);
+        mOpLabels = context.getResources().getTextArray(R.array.app_ops_labels_cm);
     }
 
     public static class OpsTemplate implements Parcelable {

diff --git a/src/com/android/settings/applications/AppOpsSummary.java b/src/com/android/settings/applications/AppOpsSummary.java
index 46ffb9d..0d47dc1 100644 (file)
--- a/src/com/android/settings/applications/AppOpsSummary.java
+++ b/src/com/android/settings/applications/AppOpsSummary.java
@@ -106,7 +106,7 @@ public class AppOpsSummary extends InstrumentedFragment {
         mContentContainer = container;
         mRootView = rootView;
 
-        mPageNames = getResources().getTextArray(R.array.app_ops_categories);
+        mPageNames = getResources().getTextArray(R.array.app_ops_categories_cm);
 
         mViewPager = (ViewPager) rootView.findViewById(R.id.pager);
         MyPagerAdapter adapter = new MyPagerAdapter(getChildFragmentManager());