diff options
| author | Steve Kondik <steve@cyngn.com> | 2016-03-10 20:30:27 -0800 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-03-11 16:59:57 -0800 |
| commit | 8c2bde132495c7556c20e55c7629511ba49943b1 (patch) | |
| tree | dd795cbe0d9b13ecd2ae44228e6d04fe101fcdde /res/values | |
| parent | 81999fd5012a33fd2e0c91ade9e3be63cdc8de7f (diff) | |
| parent | 818a79f375031dc57c3ba12a363da08c9a1d82f1 (diff) | |
| download | android_packages_services_Telecomm-8c2bde132495c7556c20e55c7629511ba49943b1.tar.gz android_packages_services_Telecomm-8c2bde132495c7556c20e55c7629511ba49943b1.tar.bz2 android_packages_services_Telecomm-8c2bde132495c7556c20e55c7629511ba49943b1.zip | |
Merge tag 'android-6.0.1_r22' of https://android.googlesource.com/platform/packages/services/Telecomm into cm-13.0staging/cm-13.0+r22
Android 6.0.1 release 22
Change-Id: I371815d38796af318dcea1e7c6cfb902a1bd0c04
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/config.xml | 7 | ||||
| -rw-r--r-- | res/values/strings.xml | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index f8f4065a..1a5f087c 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -44,4 +44,11 @@ <!-- DSDA phones that don't support local call hold need special handling --> <bool name="dsda_supports_lch">true</bool> + + <!-- Component name for the notification handler. The presence of this value will disable + MissedCallNotifierImpl's presentation of missed call/voice notifications [DO NOT TRANSLATE] --> + <string name="notification_component" translatable="false"></string> + + <!-- Flag indicating whether audio should be routed to speaker when docked --> + <bool name="use_speaker_when_docked">true</bool> </resources> diff --git a/res/values/strings.xml b/res/values/strings.xml index 26df5748..cdae0039 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -85,7 +85,7 @@ <!-- Message indicating that the user is not allowed to make non-emergency outgoing phone calls due to a user restriction --> - <string name="outgoing_call_not_allowed_user_restriction">Only emergency calls are allowed by the device owner.</string> + <string name="outgoing_call_not_allowed_user_restriction">Only emergency calls are allowed.</string> <!-- Message indicating that the user is not allowed to make non-emergency outgoing phone calls due to the lack of the CALL_PHONE permission --> |