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

Merge "Fix bug in DevicePickerFragment" into oc-dr1-dev am: 0e467d594e

Browse Source 
am: ba757bb235

Change-Id: I64e8378be62775844191b8394cae203c58e4b2fd
This commit is contained in:
jackqdyulei
2017-07-12 22:28:28 +00:00
committed by android-build-merger
parent 82ee7cf14f ba757bb235
commit 236be82872
2 changed files with 74 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/com/android/settings/bluetooth/DevicePickerFragment.java
View File

@@ -25,6 +25,7 @@ import android.content.Context;
import android.content.Intent;
import android.os.Bundle;
import android.os.UserManager;
import android.support.annotation.VisibleForTesting;
import android.view.Menu;
import android.view.MenuInflater;
@@ -43,15 +44,18 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
private static final String KEY_BT_DEVICE_LIST = "bt_device_list";
private static final String TAG = "DevicePickerFragment";
public DevicePickerFragment() {
super(null /* Not tied to any user restrictions. */);
}
@VisibleForTesting
BluetoothProgressCategory mAvailableDevicesCategory;
private boolean mNeedAuth;
private String mLaunchPackage;
private String mLaunchClass;
private boolean mScanAllowed;
public DevicePickerFragment() {
super(null /* Not tied to any user restrictions. */);
}
@Override
void initPreferencesFromPreferenceScreen() {
Intent intent = getActivity().getIntent();
@@ -60,6 +64,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
BluetoothDevicePicker.FILTER_TYPE_ALL));
mLaunchPackage = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_PACKAGE);
mLaunchClass = intent.getStringExtra(BluetoothDevicePicker.EXTRA_LAUNCH_CLASS);
mAvailableDevicesCategory = (BluetoothProgressCategory) findPreference(KEY_BT_DEVICE_LIST);
}
@Override
@@ -88,6 +93,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
mSelectedDevice = null;
if (mScanAllowed) {
enableScanning();
mAvailableDevicesCategory.setProgress(mLocalAdapter.isDiscovering());
}
}
@@ -123,6 +129,13 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
}
}
@Override
public void onScanningStateChanged(boolean started) {
super.onScanningStateChanged(started);
started |= mScanEnabled;
mAvailableDevicesCategory.setProgress(started);
}
public void onDeviceBondStateChanged(CachedBluetoothDevice cachedDevice,
int bondState) {
BluetoothDevice device = cachedDevice.getDevice();