Refactor Bluetooth settings for readability and performance.
Major refactoring of Bluetooth settings classes. - Moved all functionality from LocalBluetoothManager into new LocalBluetoothAdapter and LocalBluetoothPreferences, and into existing classes. - Refactored functionality from BluetoothEventRedirector into new BluetoothEventManager class, deleting the original version. New version uses a HashMap from action Strings to implementers of the BluetoothEventManager.Handler interface. - Created new BluetoothDiscoveryReceiver to update shared preferences timestamp for Bluetooth discovery start/finish. This is the only event handling we need to do when the settings app is not visible, so it has its own receiver entry in AndroidManifest.xml. Edits are written using QueuedWork.singleThreadExecutor(), which BroadcastReceiver knows about and will wait for completion, eliminating the need for PendingResult. - Miscellaneous cleanups to code style and logic for readability. - Pulled some large switch statement code blocks into new methods. - Changed all Bluetooth state references to the new BluetoothProfile constants. - Changed use of deprecated Notification constructor in BluetoothPairingRequest to use Notification.Builder. - Moved Utf8ByteLengthFilter helper function from BluetoothNamePreference into its own class, and moved test cases into the same package. - Moved all LocalBluetoothProfileManager functionality related to specific profiles into new top-level classes (A2dpProfile, etc.), all implementing the LocalBluetoothProfile interface. - Moved all UI-related methods from CachedBluetoothDevice into the class that uses the method, or into the static Utils class for shared methods. Change-Id: I6d49b7f4ae0c7d7dcf62551ee40b51ecb5fe4f47
This commit is contained in:
99
src/com/android/settings/bluetooth/Utils.java
Normal file
99
src/com/android/settings/bluetooth/Utils.java
Normal file
@@ -0,0 +1,99 @@
|
||||
/*
|
||||
* Copyright (C) 2011 The Android Open Source Project
|
||||
*
|
||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||
* you may not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing, software
|
||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
* See the License for the specific language governing permissions and
|
||||
* limitations under the License.
|
||||
*/
|
||||
|
||||
package com.android.settings.bluetooth;
|
||||
|
||||
import android.app.AlertDialog;
|
||||
import android.bluetooth.BluetoothClass;
|
||||
import android.bluetooth.BluetoothProfile;
|
||||
import android.content.Context;
|
||||
import android.content.DialogInterface;
|
||||
import android.widget.Toast;
|
||||
|
||||
import com.android.settings.R;
|
||||
|
||||
/**
|
||||
* Utils is a helper class that contains constants for various
|
||||
* Android resource IDs, debug logging flags, and static methods
|
||||
* for creating dialogs.
|
||||
*/
|
||||
final class Utils {
|
||||
static final boolean V = false; // verbose logging
|
||||
static final boolean D = true; // regular logging
|
||||
|
||||
private Utils() {
|
||||
}
|
||||
|
||||
public static int getConnectionStateSummary(int connectionState) {
|
||||
switch (connectionState) {
|
||||
case BluetoothProfile.STATE_CONNECTED:
|
||||
return R.string.bluetooth_connected;
|
||||
case BluetoothProfile.STATE_CONNECTING:
|
||||
return R.string.bluetooth_connecting;
|
||||
case BluetoothProfile.STATE_DISCONNECTED:
|
||||
return R.string.bluetooth_disconnected;
|
||||
case BluetoothProfile.STATE_DISCONNECTING:
|
||||
return R.string.bluetooth_disconnecting;
|
||||
default:
|
||||
return 0;
|
||||
}
|
||||
}
|
||||
|
||||
// Create (or recycle existing) and show disconnect dialog.
|
||||
static AlertDialog showDisconnectDialog(Context context,
|
||||
AlertDialog dialog,
|
||||
DialogInterface.OnClickListener disconnectListener,
|
||||
CharSequence title, CharSequence message) {
|
||||
if (dialog == null) {
|
||||
dialog = new AlertDialog.Builder(context)
|
||||
.setPositiveButton(android.R.string.ok, disconnectListener)
|
||||
.setNegativeButton(android.R.string.cancel, null)
|
||||
.create();
|
||||
} else {
|
||||
if (dialog.isShowing()) {
|
||||
dialog.dismiss();
|
||||
}
|
||||
// use disconnectListener for the correct profile(s)
|
||||
CharSequence okText = context.getText(android.R.string.ok);
|
||||
dialog.setButton(DialogInterface.BUTTON_POSITIVE,
|
||||
okText, disconnectListener);
|
||||
}
|
||||
dialog.setTitle(title);
|
||||
dialog.setMessage(message);
|
||||
dialog.show();
|
||||
return dialog;
|
||||
}
|
||||
|
||||
// TODO: wire this up to show connection errors...
|
||||
static void showConnectingError(Context context, String name) {
|
||||
// if (!mIsConnectingErrorPossible) {
|
||||
// return;
|
||||
// }
|
||||
// mIsConnectingErrorPossible = false;
|
||||
|
||||
showError(context, name, R.string.bluetooth_connecting_error_message);
|
||||
}
|
||||
|
||||
static void showError(Context context, String name, int messageResId) {
|
||||
String message = context.getString(messageResId, name);
|
||||
new AlertDialog.Builder(context)
|
||||
.setIcon(android.R.drawable.ic_dialog_alert)
|
||||
.setTitle(R.string.bluetooth_error_title)
|
||||
.setMessage(message)
|
||||
.setPositiveButton(android.R.string.ok, null)
|
||||
.show();
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user