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

Remove getCategoryKey() from DashboardFragment children.

Browse Source 
Use the centralized registry to look up category key instead.

Bug: 32936784
Test: make RunSettingsRoboTests -j40
Change-Id: I0b8c72d70f93e4b5c58871ac90de41f69ad15653
This commit is contained in:
Fan Zhang
2017-01-24 14:02:17 -08:00
parent 88c0364ace
commit 7e6df837ee
32 changed files with 34 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,6 @@ 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.drawer.CategoryKey;
import java.util.ArrayList;
import java.util.Arrays;
@@ -47,11 +46,6 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
return MetricsProto.MetricsEvent.SETTINGS_CONNECTED_DEVICE_CATEGORY;
}
@Override
protected String getCategoryKey() {
return CategoryKey.CATEGORY_DEVICE;
}
@Override
protected String getLogTag() {
return TAG;
@@ -73,8 +67,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
mUsbPrefController = new UsbModePreferenceController(context, new UsbBackend(context));
lifecycle.addObserver(mUsbPrefController);
controllers.add(mUsbPrefController);
mBluetoothPreferenceController =
new BluetoothMasterSwitchPreferenceController(
mBluetoothPreferenceController = new BluetoothMasterSwitchPreferenceController(
context, Utils.getLocalBtManager(context));
lifecycle.addObserver(mBluetoothPreferenceController);
controllers.add(mBluetoothPreferenceController);