Merge "Fix QuickContact is finished when cancelling link action" into ub-contactsdialer-h-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index dfef475..3ad9d89 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -218,13 +218,13 @@
<string name="menu_unredirect_calls_to_vm">Unroute to voicemail</string>
<!-- Warning dialog contents after users select to delete a ReadOnly contact. [CHAR LIMIT=NONE] -->
- <string name="readOnlyContactWarning">Contacts from your read-only accounts cannot be deleted, but they can be hidden.</string>
+ <string name="readOnlyContactWarning">This contact is read-only. It can\'t be deleted, but you can hide it.</string>
<!-- Positive button text of the warning dialog contents after users select to delete a ReadOnly contact. [CHAR LIMIT=30]-->
- <string name="readOnlyContactWarning_positive_button">Hide</string>
+ <string name="readOnlyContactWarning_positive_button">Hide Contact</string>
<!-- Warning dialog contents after users selects to delete a contact with ReadOnly and Writable sources. [CHAR LIMIT=NONE]-->
- <string name="readOnlyContactDeleteConfirmation">The contact to be deleted has details from multiple accounts. Details from read-only accounts will be hidden, not deleted.</string>
+ <string name="readOnlyContactDeleteConfirmation">Read-only accounts in this contact will be hidden, not deleted.</string>
<!-- Confirmation dialog. Shown after user selects to delete one writable contact [CHAR LIMIT=NONE] -->
<string name="single_delete_confirmation">Delete this contact?</string>
@@ -1877,11 +1877,10 @@
<string name="account_sync_off">Account sync is off. Tap to turn on.</string>
<!-- Title of dialog to turn auto-sync on [CHAR LIMIT=100] -->
- <string name="turn_auto_sync_on_dialog_title">Turn auto-sync on?</string>
+ <string name="turn_auto_sync_on_dialog_title">Turn on auto-sync?</string>
<!-- Text of dialog to turn auto-sync on [CHAR LIMIT=500] -->
- <string name="turn_auto_sync_on_dialog_body">Changes you make to all apps and accounts,
- not just Contacts, will be synchronized between the web and your devices.</string>
+ <string name="turn_auto_sync_on_dialog_body">Changes you make to all apps and accounts, not just Google Contacts, will be kept up to date between the web and your devices.</string>
<!-- Confirm button text for dialog to turn auto-sync on [CHAR LIMIT=30] -->
<string name="turn_auto_sync_on_dialog_confirm_btn">Turn on</string>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index ad0915e..ab1a4ba 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -91,6 +91,8 @@
<item name="list_item_avatar_offset_top">-1dp</item>
<!-- Favorites -->
<item name="favorites_padding_bottom">0dip</item>
+ <!-- Popup menu -->
+ <item name="android:popupMenuStyle">@style/PopupMenuStyle</item>
</style>
<style name="PeopleActivityTheme" parent="@style/PeopleThemeAppCompat">
@@ -166,6 +168,17 @@
<!-- Favorites -->
<item name="favorites_padding_bottom">0dip</item>
<item name="drawerArrowStyle">@style/DrawerArrowStyle</item>
+ <!-- Popup menu -->
+ <item name="android:popupMenuStyle">@style/PopupMenuStyleAppCompat</item>
+ <item name="popupMenuStyle">@style/PopupMenuStyleAppCompat</item>
+ </style>
+
+ <style name="PopupMenuStyle" parent="@android:style/Widget.PopupMenu">
+ <item name="android:popupBackground">@android:color/white</item>
+ </style>
+
+ <style name="PopupMenuStyleAppCompat" parent="Widget.AppCompat.PopupMenu">
+ <item name="android:popupBackground">@android:color/white</item>
</style>
<style name="ContactsActionButtonStyle" parent="Widget.AppCompat.ActionButton">