In Change Ia9750adb6b4c1424d084381e9d7c2ca8e7912391, addCachedDevices()
becomes async, but the filter is set outside of addCachedDevices(),
which makes the filter not apply to addCachedDevices().
Direct pass the filter to addCachedDevices() to fix this issue.
Also migrate the test to Kotlin so we can test coroutine.
Fix: 289876965
Test: manual - check BT pairing page
Test: m RunSettingsRoboTests
Change-Id: I95b16840881747ec9f69e5cd778e456bcc8a7626
(cherry picked from commit 8dd32ab07d
)
Merged-In: I95b16840881747ec9f69e5cd778e456bcc8a7626
138 lines
4.0 KiB
Java
138 lines
4.0 KiB
Java
/*
|
|
* Copyright (C) 2017 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.settings.SettingsEnums;
|
|
import android.bluetooth.BluetoothAdapter;
|
|
import android.content.Context;
|
|
import android.os.Bundle;
|
|
import android.view.View;
|
|
|
|
import androidx.annotation.NonNull;
|
|
import androidx.annotation.Nullable;
|
|
import androidx.annotation.VisibleForTesting;
|
|
|
|
import com.android.settings.R;
|
|
import com.android.settingslib.bluetooth.BluetoothDeviceFilter;
|
|
import com.android.settingslib.search.Indexable;
|
|
import com.android.settingslib.widget.FooterPreference;
|
|
|
|
/**
|
|
* BluetoothPairingDetail is a page to scan bluetooth devices and pair them.
|
|
*/
|
|
public class BluetoothPairingDetail extends BluetoothDevicePairingDetailBase implements
|
|
Indexable {
|
|
private static final String TAG = "BluetoothPairingDetail";
|
|
|
|
@VisibleForTesting
|
|
static final String KEY_AVAIL_DEVICES = "available_devices";
|
|
@VisibleForTesting
|
|
static final String KEY_FOOTER_PREF = "footer_preference";
|
|
|
|
@VisibleForTesting
|
|
FooterPreference mFooterPreference;
|
|
@VisibleForTesting
|
|
AlwaysDiscoverable mAlwaysDiscoverable;
|
|
|
|
public BluetoothPairingDetail() {
|
|
super();
|
|
}
|
|
|
|
@Override
|
|
public void onAttach(Context context) {
|
|
super.onAttach(context);
|
|
use(BluetoothDeviceRenamePreferenceController.class).setFragment(this);
|
|
}
|
|
|
|
@Override
|
|
public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceState) {
|
|
super.onViewCreated(view, savedInstanceState);
|
|
mAlwaysDiscoverable = new AlwaysDiscoverable(getContext());
|
|
}
|
|
|
|
@Override
|
|
public void onStart() {
|
|
super.onStart();
|
|
mAvailableDevicesCategory.setProgress(mBluetoothAdapter.isDiscovering());
|
|
}
|
|
|
|
@Override
|
|
public void onStop() {
|
|
super.onStop();
|
|
// Make the device only visible to connected devices.
|
|
mAlwaysDiscoverable.stop();
|
|
}
|
|
|
|
@Override
|
|
public void initPreferencesFromPreferenceScreen() {
|
|
super.initPreferencesFromPreferenceScreen();
|
|
mFooterPreference = findPreference(KEY_FOOTER_PREF);
|
|
mFooterPreference.setSelectable(false);
|
|
}
|
|
|
|
@Override
|
|
public int getMetricsCategory() {
|
|
return SettingsEnums.BLUETOOTH_PAIRING;
|
|
}
|
|
|
|
/**
|
|
* {@inheritDoc}
|
|
*
|
|
* Will update footer and keep the device discoverable as long as the page is visible.
|
|
*/
|
|
@VisibleForTesting
|
|
@Override
|
|
public void updateContent(int bluetoothState) {
|
|
super.updateContent(bluetoothState);
|
|
if (bluetoothState == BluetoothAdapter.STATE_ON) {
|
|
if (mInitialScanStarted) {
|
|
// Don't show bonded devices when screen turned back on
|
|
addCachedDevices(BluetoothDeviceFilter.UNBONDED_DEVICE_FILTER);
|
|
}
|
|
updateFooterPreference(mFooterPreference);
|
|
mAlwaysDiscoverable.start();
|
|
}
|
|
}
|
|
|
|
@Override
|
|
public void onScanningStateChanged(boolean started) {
|
|
super.onScanningStateChanged(started);
|
|
started |= mScanEnabled;
|
|
mAvailableDevicesCategory.setProgress(started);
|
|
}
|
|
|
|
@Override
|
|
public int getHelpResource() {
|
|
return R.string.help_url_bluetooth;
|
|
}
|
|
|
|
@Override
|
|
protected String getLogTag() {
|
|
return TAG;
|
|
}
|
|
|
|
@Override
|
|
protected int getPreferenceScreenResId() {
|
|
return R.xml.bluetooth_pairing_detail;
|
|
}
|
|
|
|
@Override
|
|
public String getDeviceListKey() {
|
|
return KEY_AVAIL_DEVICES;
|
|
}
|
|
}
|