Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 514bf66..299ef24 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1635,6 +1635,10 @@
<!-- Dialog for Access Points --> <skip />
<!-- Label to show/hide advanced options [CHAR LIMIT=40] -->
<string name="wifi_show_advanced">Advanced options</string>
+ <!-- Message for talkback to say when Advanced Options expanded [CHAR LIMIT=NONE] -->
+ <string name="wifi_advanced_toggle_description_expanded">Drop down list Advanced Options. Double-tap to collapse.</string>
+ <!-- Message for talkback to say when Advanced Options is collapsed [CHAR LIMIT=NONE] -->
+ <string name="wifi_advanced_toggle_description_collapsed">Drop down list Advanced Options. Double-tap to expand.</string>
<!-- Title for the WPS setup dialog [CHAR LIMIT=50] -->
<string name="wifi_wps_setup_title">Wi\u2011Fi Protected Setup</string>
<!-- Message in WPS dialog at start up [CHAR LIMIT=150] -->
@@ -6196,13 +6200,14 @@
</string>
<!-- Title for what display preferences are applied when device is in VR mode -->
- <string name="display_vr_pref_title">When device is in VR mode</string>
+ <string name="display_vr_pref_title">When device is in VR</string>
<!-- [CHAR LIMIT=70] Put display into low-persistence mode, this decreases motion blur. -->
- <string name="display_vr_pref_low_persistence">Use low motion blur settings</string>
+ <string name="display_vr_pref_low_persistence">Reduce blur (recommended)</string>
- <!-- [CHAR LIMIT=70] Do not change display settings. -->
- <string name="display_vr_pref_off">Do nothing</string>
+ <!-- [CHAR LIMIT=70] Do not change default display settings, this may reduce perceived screen
+ flicker while in VR mode. -->
+ <string name="display_vr_pref_off">Reduce flicker</string>
<!-- Sound & notification > Advanced section: Title for managing Do Not Disturb access option. [CHAR LIMIT=40] -->
<string name="manage_zen_access_title">Do Not Disturb access</string>
@@ -7762,25 +7767,29 @@
<!-- Summary text for double twist for camera mode [CHAR LIMIT=160]-->
<string name="double_twist_for_camera_mode_summary"></string>
- <!-- Title text for ambient display double tap [CHAR LIMIT=60]-->
- <string name="ambient_display_title">Quick screen check - Double Tap</string>
+ <!-- Title text for ambient display double tap (phone) [CHAR LIMIT=60]-->
+ <string name="ambient_display_title" product="default">Double-tap to check phone</string>
+ <!-- Title text for ambient display double tap (tablet) [CHAR LIMIT=60]-->
+ <string name="ambient_display_title" product="tablet">Double-tap to check tablet</string>
+ <!-- Title text for ambient display double tap (device) [CHAR LIMIT=60]-->
+ <string name="ambient_display_title" product="device">Double-tap to check device</string>
- <!-- Summary text for ambient display double tap (phone) [CHAR LIMIT=160]-->
- <string name="ambient_display_summary" product="default">To check your phone without waking it up fully, double-tap it</string>
- <!-- Summary text for ambient display double tap (tablet) [CHAR LIMIT=160]-->
- <string name="ambient_display_summary" product="tablet">To check your tablet without waking it up fully, double-tap it</string>
- <!-- Summary text for ambient display double tap (device) [CHAR LIMIT=160]-->
- <string name="ambient_display_summary" product="device">To check your device without waking it up fully, double-tap it</string>
+ <!-- Summary text for ambient display double tap [CHAR LIMIT=160]-->
+ <string name="ambient_display_summary">To quickly check your notifications, double-tap your screen</string>
- <!-- Title text for ambient display pick up [CHAR LIMIT=60]-->
- <string name="ambient_display_pickup_title">Quick screen check - Pickup notifications</string>
+ <!-- Title text for ambient display pick up (phone) [CHAR LIMIT=60]-->
+ <string name="ambient_display_pickup_title" product="default">Lift to check phone</string>
+ <!-- Title text for ambient display pick up (tablet) [CHAR LIMIT=60]-->
+ <string name="ambient_display_pickup_title" product="tablet">Lift to check tablet</string>
+ <!-- Title text for ambient display pick up (device) [CHAR LIMIT=60]-->
+ <string name="ambient_display_pickup_title" product="device">Lift to check device</string>
<!-- Summary text for ambient display (phone) [CHAR LIMIT=160]-->
- <string name="ambient_display_pickup_summary" product="default">To check your phone without waking it up fully, pick it up</string>
+ <string name="ambient_display_pickup_summary" product="default">To quickly check your notifications, pick up your phone</string>
<!-- Summary text for ambient display (tablet) [CHAR LIMIT=160]-->
- <string name="ambient_display_pickup_summary" product="tablet">To check your tablet without waking it up fully, pick it up</string>
+ <string name="ambient_display_pickup_summary" product="tablet">To quickly check your notifications, pick up your tablet</string>
<!-- Summary text for ambient display (device) [CHAR LIMIT=160]-->
- <string name="ambient_display_pickup_summary" product="device">To check your device without waking it up fully, pick it up</string>
+ <string name="ambient_display_pickup_summary" product="device">To quickly check your notifications, pick up your device</string>
<!-- Title text for fingerprint swipe for notifications [CHAR LIMIT=60]-->
<string name="fingerprint_swipe_for_notifications_title">Swipe for notifications</string>
diff --git a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
index ca4d4f5..81614e0 100755
--- a/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
+++ b/src/com/android/settings/bluetooth/DeviceProfilesSettings.java
@@ -103,7 +103,7 @@
deviceName.setText(mCachedDevice.getName(), TextView.BufferType.EDITABLE);
return new AlertDialog.Builder(getContext())
.setView(mRootView)
- .setNegativeButton(R.string.forget, this)
+ .setNeutralButton(R.string.forget, this)
.setPositiveButton(R.string.okay, this)
.setTitle(R.string.bluetooth_preference_paired_devices)
.create();