Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Sort Bluetooth devices in quick settings by name"

Browse Source
This commit is contained in:
Jason Monk
2015-03-25 14:12:12 +00:00
committed by Gerrit Code Review
parent 4b7b21ec83 a8f45e63c7
commit 039013c28e
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothController.java
View File

@@ -37,7 +37,7 @@ public interface BluetoothController {
void onBluetoothPairedDevicesChanged(); void onBluetoothPairedDevicesChanged();
} }
public static final class PairedDevice { public static final class PairedDevice implements Comparable<PairedDevice> {
public static int STATE_DISCONNECTED = 0; public static int STATE_DISCONNECTED = 0;
public static int STATE_CONNECTING = 1; public static int STATE_CONNECTING = 1;
public static int STATE_CONNECTED = 2; public static int STATE_CONNECTED = 2;
@@ -55,5 +55,9 @@ public interface BluetoothController {
if (state == STATE_DISCONNECTING) return "STATE_DISCONNECTING"; if (state == STATE_DISCONNECTING) return "STATE_DISCONNECTING";
return "UNKNOWN"; return "UNKNOWN";
} }
public int compareTo(PairedDevice another) {
return name.compareTo(another.name);
}
} }
} }

6
packages/SystemUI/src/com/android/systemui/statusbar/policy/BluetoothControllerImpl.java
View File

@@ -45,7 +45,6 @@ import android.os.Looper;
import android.os.Message; import android.os.Message;
import android.os.ParcelUuid; import android.os.ParcelUuid;
import android.util.ArrayMap; import android.util.ArrayMap;
import android.util.ArraySet;
import android.util.Log; import android.util.Log;
import android.util.SparseArray; import android.util.SparseArray;
@@ -55,6 +54,7 @@ import java.io.FileDescriptor;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Set; import java.util.Set;
import java.util.TreeSet;
public class BluetoothControllerImpl implements BluetoothController { public class BluetoothControllerImpl implements BluetoothController {
private static final String TAG = "BluetoothController"; private static final String TAG = "BluetoothController";
@@ -194,8 +194,8 @@ public class BluetoothControllerImpl implements BluetoothController {
} }
@Override @Override
public ArraySet<PairedDevice> getPairedDevices() { public Set<PairedDevice> getPairedDevices() {
final ArraySet<PairedDevice> rt = new ArraySet<>(); final Set<PairedDevice> rt = new TreeSet<>();
for (int i = 0; i < mDeviceInfo.size(); i++) { for (int i = 0; i < mDeviceInfo.size(); i++) {
final BluetoothDevice device = mDeviceInfo.keyAt(i); final BluetoothDevice device = mDeviceInfo.keyAt(i);
final DeviceInfo info = mDeviceInfo.valueAt(i); final DeviceInfo info = mDeviceInfo.valueAt(i);