Merge "Add search index provider for bt page" into pi-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
9492aa546d
@@ -93,9 +93,9 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback {
|
||||
}
|
||||
}
|
||||
|
||||
public BluetoothDeviceUpdater(DashboardFragment fragment,
|
||||
public BluetoothDeviceUpdater(Context context, DashboardFragment fragment,
|
||||
DevicePreferenceCallback devicePreferenceCallback) {
|
||||
this(fragment, devicePreferenceCallback, Utils.getLocalBtManager(fragment.getContext()));
|
||||
this(fragment, devicePreferenceCallback, Utils.getLocalBtManager(context));
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
|
@@ -17,6 +17,7 @@ package com.android.settings.bluetooth;
|
||||
|
||||
import android.bluetooth.BluetoothAdapter;
|
||||
import android.bluetooth.BluetoothDevice;
|
||||
import android.content.Context;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
|
||||
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
||||
@@ -29,9 +30,9 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
||||
*/
|
||||
public class ConnectedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
|
||||
|
||||
public ConnectedBluetoothDeviceUpdater(DashboardFragment fragment,
|
||||
public ConnectedBluetoothDeviceUpdater(Context context, DashboardFragment fragment,
|
||||
DevicePreferenceCallback devicePreferenceCallback) {
|
||||
super(fragment, devicePreferenceCallback);
|
||||
super(context, fragment, devicePreferenceCallback);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
|
@@ -17,6 +17,7 @@ package com.android.settings.bluetooth;
|
||||
|
||||
import android.bluetooth.BluetoothAdapter;
|
||||
import android.bluetooth.BluetoothDevice;
|
||||
import android.content.Context;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
|
||||
import com.android.settings.connecteddevice.DevicePreferenceCallback;
|
||||
@@ -29,9 +30,9 @@ import com.android.settingslib.bluetooth.LocalBluetoothManager;
|
||||
*/
|
||||
public class SavedBluetoothDeviceUpdater extends BluetoothDeviceUpdater {
|
||||
|
||||
public SavedBluetoothDeviceUpdater(DashboardFragment fragment,
|
||||
public SavedBluetoothDeviceUpdater(Context context, DashboardFragment fragment,
|
||||
DevicePreferenceCallback devicePreferenceCallback) {
|
||||
super(fragment, devicePreferenceCallback);
|
||||
super(context, fragment, devicePreferenceCallback);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
|
@@ -26,17 +26,22 @@ import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settings.dashboard.SummaryLoader;
|
||||
import com.android.settings.nfc.NfcPreferenceController;
|
||||
import com.android.settings.search.BaseSearchIndexProvider;
|
||||
import com.android.settings.search.Indexable;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
public class ConnectedDeviceDashboardFragment extends DashboardFragment {
|
||||
|
||||
private static final String TAG = "ConnectedDeviceFrag";
|
||||
|
||||
@VisibleForTesting
|
||||
static final String KEY_CONNECTED_DEVICES = "connected_device_list";
|
||||
@VisibleForTesting
|
||||
static final String KEY_SAVED_DEVICES = "saved_device_list";
|
||||
|
||||
@Override
|
||||
public int getMetricsCategory() {
|
||||
return MetricsProto.MetricsEvent.SETTINGS_CONNECTED_DEVICE_CATEGORY;
|
||||
@@ -59,11 +64,14 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
final Lifecycle lifecycle = getLifecycle();
|
||||
return buildPreferenceControllers(context, getLifecycle(), this);
|
||||
}
|
||||
|
||||
controllers.add(new ConnectedDeviceGroupController(this, lifecycle));
|
||||
controllers.add(new SavedDeviceGroupController(this, lifecycle));
|
||||
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,
|
||||
Lifecycle lifecycle, DashboardFragment dashboardFragment) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
controllers.add(new ConnectedDeviceGroupController(context, dashboardFragment, lifecycle));
|
||||
controllers.add(new SavedDeviceGroupController(context, dashboardFragment, lifecycle));
|
||||
|
||||
return controllers;
|
||||
}
|
||||
@@ -108,18 +116,30 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
|
||||
/**
|
||||
* For Search.
|
||||
*/
|
||||
//TODO(b/69333961): update the index for this new fragment
|
||||
public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
public static final SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
|
||||
new BaseSearchIndexProvider() {
|
||||
@Override
|
||||
public List<SearchIndexableResource> getXmlResourcesToIndex(
|
||||
Context context, boolean enabled) {
|
||||
return new ArrayList<>();
|
||||
final SearchIndexableResource sir = new SearchIndexableResource(context);
|
||||
sir.xmlResId = R.xml.connected_devices;
|
||||
return Arrays.asList(sir);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<AbstractPreferenceController> createPreferenceControllers(Context
|
||||
context) {
|
||||
return buildPreferenceControllers(context, null /* lifecycle */,
|
||||
null /* dashboardFragment */);
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<String> getNonIndexableKeys(Context context) {
|
||||
return new ArrayList<>();
|
||||
List<String> keys = super.getNonIndexableKeys(context);
|
||||
// Disable because they show dynamic data
|
||||
keys.add(KEY_CONNECTED_DEVICES);
|
||||
keys.add(KEY_SAVED_DEVICES);
|
||||
return keys;
|
||||
}
|
||||
};
|
||||
}
|
||||
|
@@ -16,6 +16,7 @@
|
||||
package com.android.settings.connecteddevice;
|
||||
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.Context;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceGroup;
|
||||
@@ -26,8 +27,6 @@ import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settings.bluetooth.BluetoothDeviceUpdater;
|
||||
import com.android.settings.bluetooth.ConnectedBluetoothDeviceUpdater;
|
||||
import com.android.settings.search.ResultPayload;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
@@ -49,10 +48,11 @@ public class ConnectedDeviceGroupController extends BasePreferenceController
|
||||
private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
|
||||
private ConnectedUsbDeviceUpdater mConnectedUsbDeviceUpdater;
|
||||
|
||||
public ConnectedDeviceGroupController(DashboardFragment fragment, Lifecycle lifecycle) {
|
||||
super(fragment.getContext(), KEY);
|
||||
init(lifecycle, new ConnectedBluetoothDeviceUpdater(fragment, this),
|
||||
new ConnectedUsbDeviceUpdater(fragment, this));
|
||||
public ConnectedDeviceGroupController(Context context, DashboardFragment fragment,
|
||||
Lifecycle lifecycle) {
|
||||
super(context, KEY);
|
||||
init(lifecycle, new ConnectedBluetoothDeviceUpdater(context, fragment, this),
|
||||
new ConnectedUsbDeviceUpdater(context, fragment, this));
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
|
@@ -16,6 +16,7 @@
|
||||
package com.android.settings.connecteddevice;
|
||||
|
||||
import android.content.pm.PackageManager;
|
||||
import android.content.Context;
|
||||
import android.support.annotation.VisibleForTesting;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceGroup;
|
||||
@@ -26,7 +27,6 @@ import com.android.settings.bluetooth.SavedBluetoothDeviceUpdater;
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settings.dashboard.DashboardFragment;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||
import com.android.settingslib.core.lifecycle.events.OnStart;
|
||||
@@ -46,9 +46,11 @@ public class SavedDeviceGroupController extends BasePreferenceController
|
||||
PreferenceGroup mPreferenceGroup;
|
||||
private BluetoothDeviceUpdater mBluetoothDeviceUpdater;
|
||||
|
||||
public SavedDeviceGroupController(DashboardFragment fragment, Lifecycle lifecycle) {
|
||||
super(fragment.getContext(), KEY);
|
||||
init(lifecycle, new SavedBluetoothDeviceUpdater(fragment, SavedDeviceGroupController.this));
|
||||
public SavedDeviceGroupController(Context context, DashboardFragment fragment,
|
||||
Lifecycle lifecycle) {
|
||||
super(context, KEY);
|
||||
init(lifecycle, new SavedBluetoothDeviceUpdater(context, fragment,
|
||||
SavedDeviceGroupController.this));
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
|
@@ -50,18 +50,18 @@ public class ConnectedUsbDeviceUpdater {
|
||||
}
|
||||
};
|
||||
|
||||
public ConnectedUsbDeviceUpdater(DashboardFragment fragment,
|
||||
public ConnectedUsbDeviceUpdater(Context context, DashboardFragment fragment,
|
||||
DevicePreferenceCallback devicePreferenceCallback) {
|
||||
this(fragment, devicePreferenceCallback, new UsbBackend(fragment.getContext()));
|
||||
this(context, fragment, devicePreferenceCallback, new UsbBackend(context));
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
ConnectedUsbDeviceUpdater(DashboardFragment fragment,
|
||||
ConnectedUsbDeviceUpdater(Context context, DashboardFragment fragment,
|
||||
DevicePreferenceCallback devicePreferenceCallback, UsbBackend usbBackend) {
|
||||
mFragment = fragment;
|
||||
mDevicePreferenceCallback = devicePreferenceCallback;
|
||||
mUsbBackend = usbBackend;
|
||||
mUsbReceiver = new UsbConnectionBroadcastReceiver(fragment.getContext(),
|
||||
mUsbReceiver = new UsbConnectionBroadcastReceiver(context,
|
||||
mUsbConnectionListener, mUsbBackend);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user