PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use same fallback bt name in Settings and notification.

Browse Source 
Bug: 30126659
Change-Id: Id1432b459a4368bae9af6067307c4da0008f94aa
This commit is contained in:
Fan Zhang
2016-08-08 14:48:24 -07:00
parent 01f26e84f4
commit 97ca78975a
3 changed files with 15 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/bluetooth/BluetoothPermissionActivity.java
View File

@@ -149,20 +149,13 @@ public class BluetoothPermissionActivity extends AlertActivity implements
if(DEBUG) Log.i(TAG, "Back button pressed! ignoring"); if(DEBUG) Log.i(TAG, "Back button pressed! ignoring");
return; return;
} }
private String createRemoteName()
{
String mRemoteName = mDevice != null ? mDevice.getAliasName() : null;
if (mRemoteName == null) mRemoteName = getString(R.string.unknown);
return mRemoteName;
}
// TODO(edjee): createConnectionDialogView, createPhonebookDialogView and createMapDialogView // TODO(edjee): createConnectionDialogView, createPhonebookDialogView and createMapDialogView
// are similar. Refactor them into one method. // are similar. Refactor them into one method.
// Also, the string resources bluetooth_remember_choice and bluetooth_pb_remember_choice should // Also, the string resources bluetooth_remember_choice and bluetooth_pb_remember_choice should
// be removed. // be removed.
private View createConnectionDialogView() { private View createConnectionDialogView() {
String mRemoteName = createRemoteName(); String mRemoteName = Utils.createRemoteName(this, mDevice);
mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null); mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
messageView = (TextView)mView.findViewById(R.id.message); messageView = (TextView)mView.findViewById(R.id.message);
messageView.setText(getString(R.string.bluetooth_connection_dialog_text, messageView.setText(getString(R.string.bluetooth_connection_dialog_text,
@@ -171,7 +164,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements
} }
private View createPhonebookDialogView() { private View createPhonebookDialogView() {
String mRemoteName = createRemoteName(); String mRemoteName = Utils.createRemoteName(this, mDevice);
mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null); mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
messageView = (TextView)mView.findViewById(R.id.message); messageView = (TextView)mView.findViewById(R.id.message);
messageView.setText(getString(R.string.bluetooth_pb_acceptance_dialog_text, messageView.setText(getString(R.string.bluetooth_pb_acceptance_dialog_text,
@@ -180,7 +173,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements
} }
private View createMapDialogView() { private View createMapDialogView() {
String mRemoteName = createRemoteName(); String mRemoteName = Utils.createRemoteName(this, mDevice);
mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null); mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
messageView = (TextView)mView.findViewById(R.id.message); messageView = (TextView)mView.findViewById(R.id.message);
messageView.setText(getString(R.string.bluetooth_map_acceptance_dialog_text, messageView.setText(getString(R.string.bluetooth_map_acceptance_dialog_text,
@@ -189,7 +182,7 @@ public class BluetoothPermissionActivity extends AlertActivity implements
} }
private View createSapDialogView() { private View createSapDialogView() {
String mRemoteName = createRemoteName(); String mRemoteName = Utils.createRemoteName(this, mDevice);
mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null); mView = getLayoutInflater().inflate(R.layout.bluetooth_access, null);
messageView = (TextView)mView.findViewById(R.id.message); messageView = (TextView)mView.findViewById(R.id.message);
messageView.setText(getString(R.string.bluetooth_sap_acceptance_dialog_text, messageView.setText(getString(R.string.bluetooth_sap_acceptance_dialog_text,

2
src/com/android/settings/bluetooth/BluetoothPermissionRequest.java
View File

@@ -135,7 +135,7 @@ public final class BluetoothPermissionRequest extends BroadcastReceiver {
deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT, deleteIntent.putExtra(BluetoothDevice.EXTRA_CONNECTION_ACCESS_RESULT,
BluetoothDevice.CONNECTION_ACCESS_NO); BluetoothDevice.CONNECTION_ACCESS_NO);
deleteIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType); deleteIntent.putExtra(BluetoothDevice.EXTRA_ACCESS_REQUEST_TYPE, mRequestType);
String deviceAlias = mDevice != null ? mDevice.getAliasName() : null; String deviceAlias = Utils.createRemoteName(context, mDevice);
switch (mRequestType) { switch (mRequestType) {
case BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS: case BluetoothDevice.REQUEST_TYPE_PHONEBOOK_ACCESS:
title = context.getString(R.string.bluetooth_phonebook_request); title = context.getString(R.string.bluetooth_phonebook_request);

10
src/com/android/settings/bluetooth/Utils.java
View File

@@ -17,6 +17,7 @@
package com.android.settings.bluetooth; package com.android.settings.bluetooth;
import android.app.AlertDialog; import android.app.AlertDialog;
import android.bluetooth.BluetoothDevice;
import android.bluetooth.BluetoothProfile; import android.bluetooth.BluetoothProfile;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
@@ -126,6 +127,15 @@ public final class Utils {
return LocalBluetoothManager.getInstance(context, mOnInitCallback); return LocalBluetoothManager.getInstance(context, mOnInitCallback);
} }
public static String createRemoteName(Context context, BluetoothDevice device) {
String mRemoteName = device != null ? device.getAliasName() : null;
if (mRemoteName == null) {
mRemoteName = context.getString(R.string.unknown);
}
return mRemoteName;
}
private static final ErrorListener mErrorListener = new ErrorListener() { private static final ErrorListener mErrorListener = new ErrorListener() {
@Override @Override
public void onShowError(Context context, String name, int messageResId) { public void onShowError(Context context, String name, int messageResId) {