summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2015-07-16 11:36:07 -0700
committerYorke Lee <yorkelee@google.com>2015-07-17 10:23:33 -0700
commit575ae388961252a771488c357e425fca191594b2 (patch)
tree81126e76d811d650cd1b44a59380a14ceb703891 /res
parent3cf92c747c54fa44240be5ba78cbc8eb6e3b8cd5 (diff)
downloadpackages_apps_Dialer-575ae388961252a771488c357e425fca191594b2.tar.gz
packages_apps_Dialer-575ae388961252a771488c357e425fca191594b2.tar.bz2
packages_apps_Dialer-575ae388961252a771488c357e425fca191594b2.zip
Add permission prompts for contacts and dialpad search
Update the following fragments to handle denied permissions -Contacts Search (Contacts and Location) -Dialpad Search (Phone) Tweak and remove some of the onTouch listener logic as they are no longer valid with the new UI. Instead of intercepting the touches when the query is empty and returning to the main dialer activity, allow the fragments to remain on screen if the permission request UI is showing. Modify signature of onEmptyViewActionButtonClicked to remove unused permissions parameter. Bug: 22174668 Change-Id: I96d00f2ab45df936dca602ac025f723638ac02c4
Diffstat (limited to 'res')
-rw-r--r--res/layout/empty_content_view.xml1
-rw-r--r--res/values/strings.xml4
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 505e49169..f07eb62ac 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>