Merge "Import translations. DO NOT MERGE ANYWHERE"
diff --git a/res/raw-night/bubble_notification_animation.mp4 b/res/raw-night/bubble_notification_animation.mp4
deleted file mode 100644
index 1a25e93..0000000
--- a/res/raw-night/bubble_notification_animation.mp4
+++ /dev/null
Binary files differ
diff --git a/res/raw/bubble_notification_animation.mp4 b/res/raw/bubble_notification_animation.mp4
deleted file mode 100644
index 563e18d..0000000
--- a/res/raw/bubble_notification_animation.mp4
+++ /dev/null
Binary files differ
diff --git a/res/raw/face_enroll_introduction_animation.mp4 b/res/raw/face_enroll_introduction_animation.mp4
deleted file mode 100644
index e69de29..0000000
--- a/res/raw/face_enroll_introduction_animation.mp4
+++ /dev/null
diff --git a/res/raw/notification_interruption_model.mp4 b/res/raw/notification_interruption_model.mp4
deleted file mode 100644
index c43d453..0000000
--- a/res/raw/notification_interruption_model.mp4
+++ /dev/null
Binary files differ
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c8208bb..5902387 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1740,16 +1740,10 @@
</plurals>
<!-- Bluetooth settings -->
- <!-- Bluetooth settings check box title on Main Settings screen -->
- <string name="bluetooth_quick_toggle_title">Bluetooth</string>
- <!-- Bluetooth settings check box summary for turning on bluetooth -->
- <string name="bluetooth_quick_toggle_summary">Turn on Bluetooth</string>
<!--Used as title on second screen after selecting Bluetooth settings -->
<string name="bluetooth_settings">Bluetooth</string>
<!--Wireless controls screen, settings title for the item to take you to the bluetooth settings screen -->
<string name="bluetooth_settings_title">Bluetooth</string>
- <!--Wireless controls screen, settings summary for the item tot ake you to the bluetooth settings screen -->
- <string name="bluetooth_settings_summary">Manage connections, set device name & discoverability</string>
<!-- ======================================================================================= -->
<!-- Note: The opening brackets of HTML style tags are escaped (e.g. "<b>" is "<b>") in -->
@@ -1780,18 +1774,9 @@
<!-- Pairing dialog text to remind user to enter the passkey on the other device. [CHAR LIMIT=NONE] -->
<string name="bluetooth_enter_passkey_other_device">You may also need to type this passkey on the other device.</string>
- <!-- Message for confirmation of passkey to complete pairing. [CHAR LIMIT=NONE] -->
- <string name="bluetooth_confirm_passkey_msg">To pair with:<br><b><xliff:g id="device_name">%1$s</xliff:g></b><br><br>Make sure it is showing this passkey:<br><b><xliff:g id="passkey">%2$s</xliff:g></b></string>
-
<!-- Pairing dialog text to remind user the pairing including all of the devices in a coordinated set. [CHAR LIMIT=NONE] -->
<string name="bluetooth_paring_group_msg">Confirm to pair with the coordinated set</string>
- <!-- Message when bluetooth incoming pairing request for (2.1 devices) dialog is showing -->
- <string name="bluetooth_incoming_pairing_msg">From:<br><b><xliff:g id="device_name">%1$s</xliff:g></b><br><br>Pair with this device?</string>
-
- <!-- Message when bluetooth dialog when passkey or pin needs to be displayed. -->
- <string name="bluetooth_display_passkey_pin_msg">To pair with:<xliff:g id="bold1"><br><b></xliff:g><xliff:g id="device_name">%1$s</xliff:g><xliff:g id="end_bold1"></b><br><br></xliff:g>Type on it:<xliff:g id="bold2"><br><b></xliff:g><xliff:g id="passkey">%2$s</xliff:g><xliff:g id="end_bold2"></b></xliff:g>, then press Return or Enter.</string>
-
<!-- Checkbox message in pairing dialogs. [CHAR LIMIT=NONE] -->
<string name="bluetooth_pairing_shares_phonebook">Allow access to your contacts and call history</string>
@@ -1801,63 +1786,18 @@
<!-- Message for the error dialog when BT connecting operation fails generically. -->
<string name="bluetooth_connecting_error_message">Couldn\u2019t connect to <xliff:g id="device_name">%1$s</xliff:g>.</string>
- <!-- Bluetooth settings: The title of the preference (list item) that initiates a scan for devices -->
- <string name="bluetooth_preference_scan_title">Scan for devices</string>
- <!-- Bluetooth settings: The title of the action button that initiates a search for nearby devices [CHAR LIMIT=20] -->
- <string name="bluetooth_search_for_devices">Refresh</string>
- <!-- Bluetooth settings: The title of the action button while a search for nearby devices is in progress [CHAR LIMIT=20] -->
- <string name="bluetooth_searching_for_devices">Searching\u2026</string>
- <!-- Bluetooth settings: The sub heading for device settings. [CHAR LIMIT=30] -->
- <string name="bluetooth_preference_device_settings">Device settings</string>
- <!-- Bluetooth settings: Paired dialog title [CHAR LIMIT=40] -->
- <string name="bluetooth_preference_paired_dialog_title">Paired device</string>
- <!-- Bluetooth settings: Checkbox label for enable/disable internet connection. [CHAR LIMIT=40] -->
- <string name="bluetooth_preference_paired_dialog_internet_option">Internet connection</string>
- <!-- Bluetooth settings: Checkbox label for enable/disable keyboard connection. [CHAR LIMIT=40] -->
- <string name="bluetooth_preference_paired_dialog_keyboard_option">Keyboard</string>
- <!-- Bluetooth settings: Checkbox label for enable/disable contacts connection. [CHAR LIMIT=40] -->
- <string name="bluetooth_preference_paired_dialog_contacts_option">Contacts and call history</string>
- <!-- Bluetooth settings: pairing dialog title. [CHAR LIMIT=40] -->
- <string name="bluetooth_pairing_dialog_title">Pair with this device?</string>
- <!-- Bluetooth settings: share phone book title. [CHAR LIMIT=40] -->
- <string name="bluetooth_pairing_dialog_sharing_phonebook_title">Share phone book?</string>
- <!-- Bluetooth settings: Message informing user that a bluetooth wants to access contant and call history. [CHAR LIMIT=100] -->
- <string name="bluetooth_pairing_dialog_contants_request"><xliff:g id="device_name">%1$s</xliff:g> wants to access your contacts and call history.</string>
- <!-- Bluetooth settings: paring permission message. [CHAR LIMIT=100] -->
- <string name="bluetooth_pairing_dialog_paring_request"><xliff:g id="device_name">%1$s</xliff:g> wants to pair with Bluetooth. When connected, it will have access to your contacts and call history.</string>
<!-- Bluetooth settings: The sub heading for available devices during and after scanning. [CHAR LIMIT=40] -->
<string name="bluetooth_preference_found_media_devices">Available devices</string>
- <!-- Bluetooth settings: The message displayed if no Bluetooth devices were found. [CHAR LIMIT=40] -->
- <string name="bluetooth_preference_no_found_devices">No devices available</string>
<!-- Bluetooth settings. Context menu item for a device. Action will connect to all profiles on the device. -->
<string name="bluetooth_device_context_connect">Connect</string>
<!-- Bluetooth settings. Context menu item for a device. Action will disconnect from all profiles on the device. -->
<string name="bluetooth_device_context_disconnect">Disconnect</string>
<!-- Bluetooth settings. Context menu item for a device. Action will first pair, and then connect to all profiles on the device. -->
<string name="bluetooth_device_context_pair_connect">Pair & connect</string>
- <!-- Bluetooth settings. Context menu item for a device. Action will remove pairing with the device. -->
- <string name="bluetooth_device_context_unpair">Unpair</string>
- <!-- Bluetooth settings. Context menu item for a device. Action will disconnect and remove pairing with the device. -->
- <string name="bluetooth_device_context_disconnect_unpair">Disconnect & unpair</string>
- <!-- Bluetooth settings. Context menu item for a device. Action will take the user to another screen where they can choose exactly which profiles to connect to. -->
- <string name="bluetooth_device_context_connect_advanced">Options\u2026</string>
- <!-- Bluetooth settings. Menu option to Bluetooth advanced settings [CHAR LIMIT=20]-->
- <string name="bluetooth_menu_advanced">Advanced</string>
- <!-- Bluetooth settings. Title of the advanced bluetooth settings screen [CHAR LIMIT=30]-->
- <string name="bluetooth_advanced_titlebar">Advanced Bluetooth</string>
<!-- Bluetooth settings. Text displayed when Bluetooth is off and device list is empty [CHAR LIMIT=50]-->
<string name="bluetooth_empty_list_bluetooth_off">When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices.</string>
<!-- Bluetooth settings. Text displayed when Bluetooth is off and bluetooth scanning is turned on [CHAR LIMIT=NONE] -->
<string name="bluetooth_scanning_on_info_message">When Bluetooth is turned on, your device can communicate with other nearby Bluetooth devices.\n\nTo improve device experience, apps and services can still scan for nearby devices at any time, even when Bluetooth is off. This can be used, for example, to improve location-based features and services. You can change this in <annotation id="link">Bluetooth scanning settings</annotation>.</string>
- <!-- Message to describe "BLE scan always available feature" when Bluetooth is off. The
- place-holders "LINK_BEGIN" and "LINK_END" must NOT be translated. They mark a link to bring
- the user to "scanning settings" screen. -->
- <string name="ble_scan_notify_text">To improve location accuracy, system apps and services can
- still detect Bluetooth devices. You can change this in
- <xliff:g id="link_begin">LINK_BEGIN</xliff:g>scanning
- settings<xliff:g id="link_end">LINK_END</xliff:g>.</string>
- <!-- Bluetooth connecting error message [CHAR LIMIT=NONE] -->
- <string name="bluetooth_connect_failed">Couldn\'t connect. Try again.</string>
<!-- Title of device details screen [CHAR LIMIT=28]-->
<string name="device_details_title">Device details</string>
@@ -1886,46 +1826,16 @@
<!-- Bluetooth device details companion apps. In the confirmation dialog for removing an associated app, this is the label on the button that will complete the disassociate action. [CHAR LIMIT=80] -->
<string name = "bluetooth_companion_app_remove_association_confirm_button">Disconnect app</string>
- <!-- Bluetooth settings. The title of the screen to pick which profiles to connect to on the device. For example, headphones may have both A2DP and headset, this allows the users to choose which one they want to connect to. -->
- <string name="bluetooth_connect_specific_profiles_title">Connect to\u2026</string>
-
- <!-- Bluetooth settings. Message for disconnecting from the A2DP profile. [CHAR LIMIT=80] -->
- <string name="bluetooth_disconnect_a2dp_profile"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from media audio.</string>
- <!-- Bluetooth settings. Message for disconnecting from the headset profile. [CHAR LIMIT=80] -->
- <string name="bluetooth_disconnect_headset_profile"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from handsfree audio.</string>
- <!-- Bluetooth settings. Message for disconnecting from the HID profile. [CHAR LIMIT=80] -->
- <string name="bluetooth_disconnect_hid_profile"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from input device.</string>
- <!-- Bluetooth settings. Message for disconnecting from the PAN profile (user role). [CHAR LIMIT=80] -->
- <string name="bluetooth_disconnect_pan_user_profile">Internet access via <xliff:g id="device_name">%1$s</xliff:g> will be disconnected.</string>
- <!-- Bluetooth settings. Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
- <string name="bluetooth_disconnect_pan_nap_profile" product="tablet"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from sharing this tablet\u2019s internet connection.</string>
- <!-- Bluetooth settings. Message for disconnecting from the PAN profile (NAP role). [CHAR LIMIT=80] -->
- <string name="bluetooth_disconnect_pan_nap_profile" product="default"><xliff:g id="device_name">%1$s</xliff:g> will be disconnected from sharing this phone\u2019s internet connection.</string>
-
<!-- Bluetooth settings. Connection options screen. The title of the screen. [CHAR LIMIT=40] -->
<string name="bluetooth_device_advanced_title">Paired Bluetooth device</string>
- <!-- Bluetooth settings. Connection options screen. The title of the checkbox that controls whether the device is in "online" mode or "offline" mode. This essentially is the checkbox that controls whether any checks / unchecks on a profile should be applied immediately, or next time the device is connected. -->
- <string name="bluetooth_device_advanced_online_mode_title">Connect</string>
- <!-- Bluetooth settings. Connection options screen. The summary of the online mode checkbox. This describes what the setting does in the context of the screen. -->
- <string name="bluetooth_device_advanced_online_mode_summary">Connect to Bluetooth device</string>
<!-- Bluetooth settings. Connection options screen. The title of the header that is above all of the profiles.
When a user decides what Bluetooth capabilities to use with the device. -->
<string name="bluetooth_device_advanced_profile_header_title">Use for</string>
- <!-- Bluetooth settings. Connection options screen. Title for option to rename the device. [CHAR LIMIT=30] -->
- <string name="bluetooth_device_advanced_rename_device">Rename</string>
- <!-- Bluetooth settings. Connection options screen. Title for checkbox to enable incoming file transfers [CHAR LIMIT=30] -->
- <string name="bluetooth_device_advanced_enable_opp_title">Allow incoming file transfers</string>
<!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
<string name="bluetooth_pan_user_profile_summary_connected">Connected to device for internet access</string>
<!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
<string name="bluetooth_pan_nap_profile_summary_connected">Sharing local internet connection with device</string>
- <!-- Bluetooth settings. Dock Setting Title -->
- <string name="bluetooth_dock_settings">Dock Settings</string>
- <!-- Bluetooth settings. Dock Setting Dialog Title -->
- <string name="bluetooth_dock_settings_title">Use dock for audio</string>
- <!-- Bluetooth settings. Dock Setting Dialog - Checkbox selection 1: Use dock as speaker phone -->
- <string name="bluetooth_dock_settings_headset">As speaker phone</string>
<!-- Bluetooth settings. Dock Setting Dialog - Checkbox selection 2: Use dock for media audio -->
<string name="bluetooth_dock_settings_a2dp">For music and media</string>
<!-- Bluetooth settings. Dock Setting Dialog - Remember setting and don't ask user again -->
@@ -3388,14 +3298,6 @@
<string name="status_prl_version">PRL version</string>
<!-- About phone screen, title for MEID for multi-sim devices -->
<string name="meid_multi_sim">MEID (sim slot %1$d)</string>
- <!-- The status text when both Wi-Fi scanning and Bluetooth scanning are on. [CHAR LIMIT=100] -->
- <string name="scanning_status_text_wifi_on_ble_on">Both Wi\u2011Fi and Bluetooth scanning are on</string>
- <!-- The status text when Wi-Fi scanning is on and Bluetooth scanning are off. [CHAR LIMIT=100] -->
- <string name="scanning_status_text_wifi_on_ble_off">Wi\u2011Fi scanning is on, Bluetooth scanning is off</string>
- <!-- The status text when Wi-Fi scanning is off and Bluetooth scanning are on. [CHAR LIMIT=100] -->
- <string name="scanning_status_text_wifi_off_ble_on">Bluetooth scanning is on, Wi\u2011Fi scanning is off</string>
- <!-- The status text when both Wi-Fi scanning and Bluetooth scanning are off. [CHAR LIMIT=100] -->
- <string name="scanning_status_text_wifi_off_ble_off">Both Wi\u2011Fi and Bluetooth scanning are off</string>
<!-- About phone, status item title. The phone MEID number of the current LTE/CDMA device. [CHAR LIMIT=30] -->
<string name="status_meid_number">MEID</string>
<!-- About phone, status item title. The ICCID of the current LTE device. [CHAR LIMIT=30] -->
@@ -3897,12 +3799,6 @@
<string name="bluetooth_tethering_subtext" product="tablet">Share tablet\u2019s internet connection via Bluetooth</string>
<!-- Bluetooth Tethering subtext [CHAR LIMIT=70]-->
<string name="bluetooth_tethering_subtext" product="default">Share phone\u2019s internet connection via Bluetooth</string>
- <!-- Bluetooth tethering off subtext - shown when Bluetooth Tethering is turned off [CHAR LIMIT=80]-->
- <string name="bluetooth_tethering_off_subtext_config">Sharing this <xliff:g id="device_name">%1$d</xliff:g>\u2019s internet connection via Bluetooth</string>
- <!-- Bluetooth Tethering settings. Error message shown when trying to connect an 8th device [CHAR LIMIT=50]-->
- <string name="bluetooth_tethering_overflow_error">Can\u2019t tether to more than <xliff:g id="maxConnection">%1$d</xliff:g> devices.</string>
- <!-- Bluetooth Tethering settings. Message for untethering from a bluetooth device [CHAR LIMIT=50]-->
- <string name="bluetooth_untether_blank"><xliff:g id="device_name">%1$s</xliff:g> will be untethered.</string>
<!-- Ethernet Tethering settings-->
<!-- Label for ethernet tether checkbox [CHAR LIMIT=NONE]-->
diff --git a/src/com/android/settings/homepage/SettingsHomepageActivity.java b/src/com/android/settings/homepage/SettingsHomepageActivity.java
index 00fdf39..8b6fde7 100644
--- a/src/com/android/settings/homepage/SettingsHomepageActivity.java
+++ b/src/com/android/settings/homepage/SettingsHomepageActivity.java
@@ -438,6 +438,8 @@
return;
}
+ targetIntent.setData(intent.getParcelableExtra(
+ SettingsHomepageActivity.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA));
final ComponentName targetComponentName = targetIntent.resolveActivity(getPackageManager());
if (targetComponentName == null) {
Log.e(TAG, "No valid target for the deep link intent: " + targetIntent);
@@ -457,9 +459,6 @@
targetIntent.putExtra(EXTRA_IS_FROM_SETTINGS_HOMEPAGE, true);
targetIntent.putExtra(SettingsActivity.EXTRA_IS_FROM_SLICE, false);
- targetIntent.setData(intent.getParcelableExtra(
- SettingsHomepageActivity.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA));
-
// Set 2-pane pair rule for the deep link page.
ActivityEmbeddingRulesController.registerTwoPanePairRule(this,
new ComponentName(getApplicationContext(), getClass()),
diff --git a/src/com/android/settings/search/SearchFeatureProvider.java b/src/com/android/settings/search/SearchFeatureProvider.java
index 1785361..b14a4d7 100644
--- a/src/com/android/settings/search/SearchFeatureProvider.java
+++ b/src/com/android/settings/search/SearchFeatureProvider.java
@@ -72,6 +72,12 @@
}
/**
+ * Send the pre-index intent.
+ */
+ default void sendPreIndexIntent(Context context){
+ }
+
+ /**
* Initializes the search toolbar.
*/
default void initSearchToolbar(FragmentActivity activity, Toolbar toolbar, int pageId) {
diff --git a/src/com/android/settings/search/SearchResultTrampoline.java b/src/com/android/settings/search/SearchResultTrampoline.java
index 7718ff3..6e7d911 100644
--- a/src/com/android/settings/search/SearchResultTrampoline.java
+++ b/src/com/android/settings/search/SearchResultTrampoline.java
@@ -22,6 +22,7 @@
import android.app.Activity;
import android.content.ComponentName;
import android.content.Intent;
+import android.net.Uri;
import android.os.Bundle;
import android.provider.Settings;
import android.text.TextUtils;
@@ -86,8 +87,12 @@
return;
}
+ final Uri data = intent.getParcelableExtra(
+ SettingsHomepageActivity.EXTRA_SETTINGS_LARGE_SCREEN_DEEP_LINK_INTENT_DATA,
+ Uri.class);
try {
intent = Intent.parseUri(intentUriString, Intent.URI_INTENT_SCHEME);
+ intent.setData(data);
} catch (URISyntaxException e) {
Log.e(TAG, "Failed to parse deep link intent: " + e);
finish();