Update APM notification String
Bug: 239983569
Test: atest ServiceBluetoothTests
Change-Id: Ia01b3b88a56a528484d6cb8dc0f217c3f400258e
Merged-In: Ia01b3b88a56a528484d6cb8dc0f217c3f400258e
diff --git a/android/app/res/values/strings.xml b/android/app/res/values/strings.xml
index 7d2bb40..2ca1d0e 100644
--- a/android/app/res/values/strings.xml
+++ b/android/app/res/values/strings.xml
@@ -248,9 +248,10 @@
<string name="a2dp_sink_mbs_label">Bluetooth Audio</string>
<string name="bluetooth_opp_file_limit_exceeded">Files bigger than 4GB cannot be transferred</string>
<string name="bluetooth_connect_action">Connect to Bluetooth</string>
- <string name="bluetooth_enabled_apm_title">You turned on Bluetooth</string>
- <string name="bluetooth_enabled_apm_message">Your phone will keep Bluetooth on in airplane mode, unless you turn it off while in this mode</string>
+ <string name="bluetooth_enabled_apm_title">Bluetooth on in airplane mode</string>
+ <string name="bluetooth_enabled_apm_message">If you keep Bluetooth on, it will stay on the next time you\'re in airplane mode</string>
<string name="bluetooth_stays_on_title">Bluetooth stays on</string>
- <string name="bluetooth_and_wifi_stays_on_title">Bluetooth and Wi-Fi stays on</string>
- <string name="bluetooth_and_wifi_stays_on_message">Your phone will keep both on in airplane mode, unless you turn it off while in this mode</string>
+ <string name="bluetooth_stays_on_message">Your phone remembers to keep Bluetooth on in airplane mode. To change this, turn off Bluetooth.</string>
+ <string name="bluetooth_and_wifi_stays_on_title">Wi-Fi and Bluetooth stay on</string>
+ <string name="bluetooth_and_wifi_stays_on_message">Your phone remembers to keep Wi-Fi and Bluetooth on in airplane mode. To change this, turn them off.</string>
</resources>
diff --git a/service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java b/service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java
index 3ff6077..cd8949b 100644
--- a/service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java
+++ b/service/java/com/android/server/bluetooth/BluetoothAirplaneModeListener.java
@@ -161,7 +161,7 @@
} else if (!isWifiEnabledOnApm() && isFirstTimeNotification(APM_BT_NOTIFICATION)) {
try {
sendApmNotification("bluetooth_stays_on_title",
- "bluetooth_enabled_apm_message",
+ "bluetooth_stays_on_message",
APM_BT_NOTIFICATION);
} catch (Exception e) {
Log.e(TAG, "APM enhancement BT stays on notification not shown");
