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

Update ConnectedDeviceGroupController

Browse Source 
Get the PreferenceGroup there and add/remove preference
through the callback

Also add ConnectedBluetoothDeviceUpdater which only filter
the connected device.

Bug: 69333961
Test: RunSettingsRoboTests

Change-Id: Ia2ab6b6708329227929d6fe442df3a8d45bf86f5
This commit is contained in:
jackqdyulei
2017-11-16 10:45:43 -08:00
parent 88579e2558
commit 75ea67c9f4
7 changed files with 369 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java
View File

@@ -17,27 +17,20 @@ package com.android.settings.connecteddevice;
import android.app.Activity;
import android.content.Context;
import android.content.pm.PackageManager;
import android.provider.SearchIndexableResource;
import android.support.annotation.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.bluetooth.BluetoothMasterSwitchPreferenceController;
import com.android.settings.bluetooth.Utils;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.deviceinfo.UsbBackend;
import com.android.settings.nfc.NfcPreferenceController;
import com.android.settings.overlay.FeatureFactory;
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 {
@@ -66,7 +59,14 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
@Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
return null;
final List<AbstractPreferenceController> controllers = new ArrayList<>();
final Lifecycle lifecycle = getLifecycle();
final ConnectedDeviceGroupController connectedDeviceGroupController =
new ConnectedDeviceGroupController(this, lifecycle);
controllers.add(connectedDeviceGroupController);
return controllers;
}
@VisibleForTesting
@@ -109,19 +109,26 @@ 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 =
new BaseSearchIndexProvider() {
@Override
public List<SearchIndexableResource> getXmlResourcesToIndex(
Context context, boolean enabled) {
return new ArrayList<>();
return new ArrayList<>();
}
@Override
public List<String> getNonIndexableKeys(Context context) {
return new ArrayList<>();
}
@Override
public List<AbstractPreferenceController> getPreferenceControllers(
Context context) {
//TODO(b/69333961): update the index for controllers
return super.getPreferenceControllers(context);
}
};
}