diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-07-17 18:44:47 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-17 18:44:47 +0000 |
| commit | 7e03db7213214eaeeafed667b57ce61839f8fd75 (patch) | |
| tree | dbdaa992343dafd7facd62dddebae576bbbc354e /res | |
| parent | 7293a99b7c8299c8e0fa0566322fe39093ccc760 (diff) | |
| parent | 91ecb13620df69c3865754290cfcdcf20b2968d5 (diff) | |
am 91ecb136: Merge "Add permission prompts for contacts and dialpad search" into mnc-dev
* commit '91ecb13620df69c3865754290cfcdcf20b2968d5':
Add permission prompts for contacts and dialpad search
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/empty_content_view.xml | 1 | ||||
| -rw-r--r-- | res/values/strings.xml | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/res/layout/empty_content_view.xml b/res/layout/empty_content_view.xml index d8f27aad8..97ac4c79c 100644 --- a/res/layout/empty_content_view.xml +++ b/res/layout/empty_content_view.xml @@ -43,7 +43,6 @@ android:paddingLeft="16dp" android:paddingTop="8dp" android:paddingBottom="8dp" - android:text="@string/permission_single_turn_on" android:background="?android:attr/selectableItemBackground" android:clickable="true" style="@style/TextActionStyle" /> diff --git a/res/values/strings.xml b/res/values/strings.xml index 38b33bd7c..eec9b0ca7 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -808,8 +808,8 @@ <!-- Shown as a prompt to turn on the phone permission to show voicemails --> <string name="permission_no_voicemail">To access your voicemail,\n turn on the Phone permission.</string> - <!-- Shown as a prompt to turn on contacts and location permissions to allow contact and nearby places search --> - <string name="permission_no_search">To search your contacts and nearby locations, turn on the Contacts and Location permissions.</string> + <!-- Shown as a prompt to turn on contacts permissions to allow contact search --> + <string name="permission_no_search">To search your contacts, turn on the Contacts permissions.</string> <!-- Shown as a prompt to turn on the phone permission to allow a call to be placed --> <string name="permission_place_call">To place a call,\n turn on the Phone permission.</string> |