diff options
Diffstat (limited to 'src/org')
8 files changed, 19 insertions, 19 deletions
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 ea98ebe..d27e516 100644 --- a/src/org/codeaurora/bluetooth/dun/BluetoothDunService.java +++ b/src/org/codeaurora/bluetooth/dun/BluetoothDunService.java @@ -817,9 +817,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 c231e41..95d2124 100644 --- a/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java +++ b/src/org/codeaurora/bluetooth/ftp/BluetoothFtpService.java @@ -841,9 +841,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; @@ -854,9 +854,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 aa6d64e..5df7535 100755 --- a/src/org/codeaurora/bluetooth/map/BluetoothMasService.java +++ b/src/org/codeaurora/bluetooth/map/BluetoothMasService.java @@ -527,9 +527,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 b32bf47..8dd06f7 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; |