BluetoothExt: Cleanup CAF strings

Change-Id: I00782b8e5656d8356a843dcc8b862275a04eba5a

13 files changed, 45 insertions, 70 deletions

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 7c01009..bbe50f3 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
+<!--
+     Copyright (C) 2007 The Android Open Source Project
+     Copyright (C) 2013-2015 The CyanogenMod Project
 
      Licensed under the Apache License, Version 2.0 (the "License");
      you may not use this file except in compliance with the License.
@@ -14,11 +16,17 @@
      limitations under the License.
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
- <string name="defaultname">Carkit</string>
+    <string name="defaultname">Carkit</string>
     <!-- Do not translate. android:process of this application. -->
-    <string name="process" translate="false"><xliff:g id="x" /></string>
+    <string name="process" translatable="false"><xliff:g id="x"/></string>
 
     <!-- Bluetooth FTP or MAP permission Alert Activity checkbox text [CHAR LIMIT=none] -->
-    <string name="bluetooth_remember_choice">Always Allow</string>
+    <string name="bluetooth_remember_choice">Don\'t ask again</string>
 
+    <string name="acceptance_timeout_message">Acceptance of connection from %1$s timed out</string>
+    <string name="authentication_timeout_message">Authentication with %1$s timed out</string>
+
+    <!-- Notification message when a Bluetooth device wants to pair with us -->
+    <string name="notif_ticker">Bluetooth connection request</string>
+    <string name="notif_message">Touch to connect to \'<xliff:g id="device_name">%1$s</xliff:g>\'.</string>
 </resources>
diff --git a/res/values/strings_dun.xml b/res/values/strings_dun.xml
index f491270..95d0228 100644
--- a/res/values/strings_dun.xml
+++ b/res/values/strings_dun.xml
@@ -2,6 +2,7 @@
 <!--
 /*
  * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2013-2015 The CyanogenMod Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -29,15 +30,8 @@
  */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="dun_notif_ticker">Bluetooth DUN request</string>
-    <!-- Notification title when a Bluetooth device wants to pair with us -->
-    <string name="dun_notif_title">Session Key Request for DUN</string>
-    <!-- Notification message when a Bluetooth device wants to pair with us -->
-    <string name="dun_notif_message">"Touch to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022."</string>
-    <string name="dun_acceptance_timeout_message">There was time out to accept connection with %1$s</string>
     <!-- Activity label of BluetoothDunPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
-    <string name="bluetooth_dun_request">"DUN request"</string>
+    <string name="bluetooth_dun_request">DUN request</string>
     <!-- Bluetooth DUN permission Alert Activity text [CHAR LIMIT=none] -->
     <string name="bluetooth_dun_acceptance_dialog_text">%1$s would like to use DUN. Give access to %2$s?</string>
-
 </resources>
diff --git a/res/values/strings_ftp.xml b/res/values/strings_ftp.xml
index 8381134..bda71a1 100644
--- a/res/values/strings_ftp.xml
+++ b/res/values/strings_ftp.xml
@@ -2,6 +2,7 @@
 <!--
 /*
  * Copyright (c) 2010-2012, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2013-2015 The CyanogenMod Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -29,26 +30,16 @@
  */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="ftp_acceptance_dialog_title">%1$s would like to access your phone folders. Give access to %2$s?</string>
-    <string name="ftp_acceptance_dialog_header">Phone Folder Access</string>
     <string name="ftp_session_key_dialog_title">Type session key for %1$s</string>
     <string name="ftp_session_key_dialog_header">Bluetooth session key required</string>
-    <string name="ftp_acceptance_timeout_message">There was time out to accept connection with %1$s</string>
-    <string name="ftp_authentication_timeout_message">There was time out to input session key with %1$s</string>
-    <string name="ftp_notif_ticker">Bluetooth connection request</string>
     <!-- Notification title when a Bluetooth device wants to pair with us -->
-    <string name="ftp_notif_title">Session Key Request for FTP</string>
-    <!-- Notification message when a Bluetooth device wants to pair with us -->
-    <string name="ftp_notif_message">"Touch to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022."</string>
-    <!-- Activity label of BluetoothFtpPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+    <string name="ftp_notif_title">Session key request for FTP</string>
     <!--Notification Title for ACTIVE SESSION -->
-    <string name="ftp_notif_active_session">Bluetooth FTP Active Session </string>
+    <string name="ftp_notif_active_session">Bluetooth FTP active session</string>
     <!--Notification message for ACTIVE SESSION -->
-    <string name="ftp_notif_connected">"Bluetotoh File Transfer Access  to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022."</string>
-
-    <string name="bluetooth_ftp_request">"Ftp request"</string>
-
+    <string name="ftp_notif_connected">Bluetooth file transfer access to \'<xliff:g id="device_name">%1$s</xliff:g>\'.</string>
+    <!-- Activity label of BluetoothFtpPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
+    <string name="bluetooth_ftp_request">FTP request</string>
     <!-- Bluetooth FTP permission Alert Activity text [CHAR LIMIT=none] -->
     <string name="bluetooth_ftp_acceptance_dialog_text">%1$s would like to access your files and folders. Give access to %2$s?</string>
-
 </resources>
diff --git a/res/values/strings_map.xml b/res/values/strings_map.xml
index 2357db8..1c4974d 100644
--- a/res/values/strings_map.xml
+++ b/res/values/strings_map.xml
@@ -2,6 +2,7 @@
 <!--
 /*
  * Copyright (c) 2011-2012, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2013-2015 The CyanogenMod Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -29,25 +30,12 @@
  */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="map_acceptance_dialog_title">%1$s would like to access your phone folders. Give access to %2$s?</string>
-    <string name="map_acceptance_dialog_header">Phone Folder Access</string>
-    <string name="map_session_key_dialog_title">Type session key for %1$s</string>
-    <string name="map_session_key_dialog_header">Bluetooth session key required</string>
-    <string name="map_acceptance_timeout_message">There was time out to accept connection with %1$s</string>
-    <string name="map_authentication_timeout_message">There was time out to input session key with %1$s</string>
-    <string name="map_notif_ticker">Bluetooth connection request</string>
     <!--Notification Title for ACTIVE SESSION -->
-    <string name="map_notif_active_session">Bluetooth MAP Active Session </string>
+    <string name="map_notif_active_session">Bluetooth MAP active session</string>
     <!--Notification message for ACTIVE SESSION -->
-    <string name="map_notif_connected">"Bluetooth Message Access  to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022."</string>
-    <!-- Notification title when a Bluetooth device wants to pair with us -->
-    <string name="map_notif_title">Session Key Request for MAP</string>
-    <!-- Notification message when a Bluetooth device wants to pair with us -->
-    <string name="map_notif_message">"Touch to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022."</string>
-    <string name="map_alert_conn_failed_message">Bluetooth MAP connection failed.</string>
+    <string name="map_notif_connected">Bluetooth message access to \'<xliff:g id="device_name">%1$s</xliff:g>\'.</string>
     <!-- Activity label of BluetoothMasPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
-    <string name="bluetooth_mas_request">"Message Access request"</string>
+    <string name="bluetooth_mas_request">Message access request</string>
     <!-- Bluetooth MAS permission Alert Activity text [CHAR LIMIT=none] -->
     <string name="bluetooth_mas_acceptance_dialog_text">%1$s would like to access your messages. Give access to %2$s?</string>
-
 </resources>
diff --git a/res/values/strings_sap.xml b/res/values/strings_sap.xml
index 0ccaaaa..7f58c27 100644
--- a/res/values/strings_sap.xml
+++ b/res/values/strings_sap.xml
@@ -2,6 +2,7 @@
 <!--
 /*
  * Copyright (c) 2011-2013, The Linux Foundation. All rights reserved.
+ * Copyright (C) 2013-2015 The CyanogenMod Project
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -29,15 +30,8 @@
  */
 -->
 <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
-    <string name="sap_notif_ticker">Bluetooth SIM Access request</string>
-    <!-- Notification title when a Bluetooth device wants to pair with us -->
-    <string name="sap_notif_title">Session Key Request for SAP</string>
-    <!-- Notification message when a Bluetooth device wants to pair with us -->
-    <string name="sap_notif_message">"Touch to connect to \u0022<xliff:g id="device_name">%1$s</xliff:g>\u0022."</string>
-    <string name="sap_acceptance_timeout_message">There was time out to accept connection with %1$s</string>
     <!-- Activity label of BluetoothSapPermissionActivity, also used as Strings in the permission dialog [CHAR LIMIT=none] -->
-    <string name="bluetooth_sap_request">"SAP request"</string>
+    <string name="bluetooth_sap_request">SAP request</string>
     <!-- Bluetooth SAP permission Alert Activity text [CHAR LIMIT=none] -->
     <string name="bluetooth_sap_acceptance_dialog_text">%1$s would like to access your SIM. Give access to %2$s?</string>
-
 </resources>
diff --git a/src/org/codeaurora/bluetooth/dun/BluetoothDunPermissionActivity.java b/src/org/codeaurora/bluetooth/dun/BluetoothDunPermissionActivity.java
index 74ffd94..b51b453 100644
--- a/src/org/codeaurora/bluetooth/dun/BluetoothDunPermissionActivity.java
+++ b/src/org/codeaurora/bluetooth/dun/BluetoothDunPermissionActivity.java
@@ -243,7 +243,7 @@ public class BluetoothDunPermissionActivity extends AlertActivity implements
         mTimeout = true;
         if (mCurrentDialog == DIALOG_YES_NO_CONNECT) {
             if(mView != null) {
-                messageView.setText(getString(R.string.dun_acceptance_timeout_message,
+                messageView.setText(getString(R.string.acceptance_timeout_message,
                         getRemoteDeviceName()));
                 mAlert.getButton(DialogInterface.BUTTON_NEGATIVE).setVisibility(View.GONE);
                 mAlwaysAllowed.setVisibility(View.GONE);
diff --git a/src/org/codeaurora/bluetooth/dun/BluetoothDunService.java b/src/org/codeaurora/bluetooth/dun/BluetoothDunService.java
index 92ec785..a987b9d 100644
--- a/src/org/codeaurora/bluetooth/dun/BluetoothDunService.java
+++ b/src/org/codeaurora/bluetooth/dun/BluetoothDunService.java
@@ -809,9 +809,9 @@ public class BluetoothDunService extends Service {
 
         deleteIntent.setAction(DUN_ACCESS_DISALLOWED_ACTION);
         notification = new Notification(android.R.drawable.stat_sys_data_bluetooth,
-            getString(R.string.dun_notif_ticker), System.currentTimeMillis());
-        notification.setLatestEventInfo(this, getString(R.string.dun_notif_ticker),
-                getString(R.string.dun_notif_message, name), PendingIntent
+            getString(R.string.notif_ticker), System.currentTimeMillis());
+        notification.setLatestEventInfo(this, getString(R.string.notif_ticker),
+                getString(R.string.notif_message, name), PendingIntent
                         .getActivity(this, 0, clickIntent, 0));
 
         notification.flags |= Notification.FLAG_AUTO_CANCEL;
diff --git a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpActivity.java b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpActivity.java
index a2896af..4190d9c 100644
--- a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpActivity.java
+++ b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpActivity.java
@@ -306,7 +306,7 @@ public class BluetoothFtpActivity extends AlertActivity implements
         Button mButton =  mAlert.getButton(DialogInterface.BUTTON_NEGATIVE);
         if(V) Log.v(TAG,"onTimeout mCurrentDialog = " + mCurrentDialog);
       if (mCurrentDialog == DIALOG_YES_NO_CONNECT) {
-            messageView.setText(getString(R.string.ftp_acceptance_timeout_message,
+            messageView.setText(getString(R.string.acceptance_timeout_message,
                     BluetoothFtpService.getRemoteDeviceName()));
             mAlert.getButton(DialogInterface.BUTTON_NEGATIVE).setVisibility(View.GONE);
             mAlwaysAllowed.setVisibility(View.GONE);
@@ -314,7 +314,7 @@ public class BluetoothFtpActivity extends AlertActivity implements
         } else if (mCurrentDialog == DIALOG_YES_NO_AUTH) {
             /* Proceed to clear the view only if one created */
             if(mView != null) {
-                messageView.setText(getString(R.string.ftp_authentication_timeout_message,
+                messageView.setText(getString(R.string.authentication_timeout_message,
                         BluetoothFtpService.getRemoteDeviceName()));
                 mKeyView.setVisibility(View.GONE);
                 mKeyView.clearFocus();
diff --git a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
index 77737aa..33a5ec6 100644
--- a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
+++ b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java
@@ -805,9 +805,9 @@ public class BluetoothFtpService extends Service {
         if (action.equals(ACCESS_REQUEST_ACTION)) {
             deleteIntent.setAction(ACCESS_DISALLOWED_ACTION);
             notification = new Notification(android.R.drawable.stat_sys_data_bluetooth,
-                getString(R.string.ftp_notif_ticker), System.currentTimeMillis());
-            notification.setLatestEventInfo(this, getString(R.string.ftp_notif_ticker),
-                    getString(R.string.ftp_notif_message, name), PendingIntent
+                getString(R.string.notif_ticker), System.currentTimeMillis());
+            notification.setLatestEventInfo(this, getString(R.string.notif_ticker),
+                    getString(R.string.notif_message, name), PendingIntent
                             .getActivity(this, 0, clickIntent, 0));
             notification.flags |= Notification.FLAG_AUTO_CANCEL;
             notification.flags |= Notification.FLAG_NO_CLEAR;
@@ -818,9 +818,9 @@ public class BluetoothFtpService extends Service {
         } else if (action.equals(AUTH_CHALL_ACTION)) {
             deleteIntent.setAction(AUTH_CANCELLED_ACTION);
             notification = new Notification(android.R.drawable.stat_sys_data_bluetooth,
-                getString(R.string.ftp_notif_ticker), System.currentTimeMillis());
+                getString(R.string.notif_ticker), System.currentTimeMillis());
             notification.setLatestEventInfo(this, getString(R.string.ftp_notif_title),
-                    getString(R.string.ftp_notif_message, name), PendingIntent
+                    getString(R.string.notif_message, name), PendingIntent
                             .getActivity(this, 0, clickIntent, 0));
 
             notification.flags |= Notification.FLAG_AUTO_CANCEL;
diff --git a/src/org/codeaurora/bluetooth/map/BluetoothMasActivity.java b/src/org/codeaurora/bluetooth/map/BluetoothMasActivity.java
index 011641c..58d91df 100644
--- a/src/org/codeaurora/bluetooth/map/BluetoothMasActivity.java
+++ b/src/org/codeaurora/bluetooth/map/BluetoothMasActivity.java
@@ -247,7 +247,7 @@ public class BluetoothMasActivity extends AlertActivity implements
         mTimeout = true;
         if (mCurrentDialog == DIALOG_YES_NO_CONNECT) {
             if(mView != null) {
-                messageView.setText(getString(R.string.map_acceptance_timeout_message,
+                messageView.setText(getString(R.string.acceptance_timeout_message,
                         getRemoteDeviceName()));
                 mAlert.getButton(DialogInterface.BUTTON_NEGATIVE).setVisibility(View.GONE);
                 mAlwaysAllowed.setVisibility(View.GONE);
diff --git a/src/org/codeaurora/bluetooth/map/BluetoothMasService.java b/src/org/codeaurora/bluetooth/map/BluetoothMasService.java
index 7ee3d3c..7d81432 100755
--- a/src/org/codeaurora/bluetooth/map/BluetoothMasService.java
+++ b/src/org/codeaurora/bluetooth/map/BluetoothMasService.java
@@ -564,9 +564,9 @@ public class BluetoothMasService extends Service {
 
         deleteIntent.setAction(ACCESS_DISALLOWED_ACTION);
         notification = new Notification(android.R.drawable.stat_sys_data_bluetooth,
-            getString(R.string.map_notif_ticker), System.currentTimeMillis());
-        notification.setLatestEventInfo(this, getString(R.string.map_notif_ticker),
-                getString(R.string.map_notif_message, name), PendingIntent
+            getString(R.string.notif_ticker), System.currentTimeMillis());
+        notification.setLatestEventInfo(this, getString(R.string.notif_ticker),
+                getString(R.string.notif_message, name), PendingIntent
                         .getActivity(this, 0, clickIntent, PendingIntent.FLAG_ONE_SHOT));
 
         notification.flags |= Notification.FLAG_AUTO_CANCEL;
diff --git a/src/org/codeaurora/bluetooth/sap/BluetoothSapPermissionActivity.java b/src/org/codeaurora/bluetooth/sap/BluetoothSapPermissionActivity.java
index 50ea399..ba6058c 100644
--- a/src/org/codeaurora/bluetooth/sap/BluetoothSapPermissionActivity.java
+++ b/src/org/codeaurora/bluetooth/sap/BluetoothSapPermissionActivity.java
@@ -243,7 +243,7 @@ public class BluetoothSapPermissionActivity extends AlertActivity implements
         mTimeout = true;
         if (mCurrentDialog == DIALOG_YES_NO_CONNECT) {
             if(mView != null) {
-                messageView.setText(getString(R.string.sap_acceptance_timeout_message,
+                messageView.setText(getString(R.string.acceptance_timeout_message,
                         getRemoteDeviceName()));
                 mAlert.getButton(DialogInterface.BUTTON_NEGATIVE).setVisibility(View.GONE);
                 mAlwaysAllowed.setVisibility(View.GONE);
diff --git a/src/org/codeaurora/bluetooth/sap/BluetoothSapService.java b/src/org/codeaurora/bluetooth/sap/BluetoothSapService.java
index cd90fad..adc3a9e 100644
--- a/src/org/codeaurora/bluetooth/sap/BluetoothSapService.java
+++ b/src/org/codeaurora/bluetooth/sap/BluetoothSapService.java
@@ -800,9 +800,9 @@ public class BluetoothSapService extends Service {
 
         deleteIntent.setAction(SAP_ACCESS_DISALLOWED_ACTION);
         notification = new Notification(android.R.drawable.stat_sys_data_bluetooth,
-            getString(R.string.sap_notif_ticker), System.currentTimeMillis());
-        notification.setLatestEventInfo(this, getString(R.string.sap_notif_ticker),
-                getString(R.string.sap_notif_message, name), PendingIntent
+            getString(R.string.notif_ticker), System.currentTimeMillis());
+        notification.setLatestEventInfo(this, getString(R.string.notif_ticker),
+                getString(R.string.notif_message, name), PendingIntent
                         .getActivity(this, 0, clickIntent, 0));
 
         notification.flags |= Notification.FLAG_AUTO_CANCEL;