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

Merge "Modify AddDevicePreferenceController's constructor" into pi-dev

Browse Source 
am: 11174d3ced

Change-Id: I28e2aeeda026f7a1268f512a4808bca9cf09e0a3
This commit is contained in:
Jyun LuoLai
2018-03-30 19:02:21 +00:00
committed by android-build-merger
parent 89918e3209 11174d3ced
commit b02f7f71a5
2 changed files with 4 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/com/android/settings/connecteddevice/AddDevicePreferenceController.java
View File

@@ -37,8 +37,6 @@ import com.android.settingslib.core.lifecycle.events.OnStop;
public class AddDevicePreferenceController extends BasePreferenceController public class AddDevicePreferenceController extends BasePreferenceController
implements LifecycleObserver, OnStart, OnStop { implements LifecycleObserver, OnStart, OnStop {
private static final String KEY = "add_bt_devices";
private Preference mPreference; private Preference mPreference;
private final BroadcastReceiver mReceiver = new BroadcastReceiver() { private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
@Override @Override
@@ -49,8 +47,8 @@ public class AddDevicePreferenceController extends BasePreferenceController
private IntentFilter mIntentFilter; private IntentFilter mIntentFilter;
private BluetoothAdapter mBluetoothAdapter; private BluetoothAdapter mBluetoothAdapter;
public AddDevicePreferenceController(Context context) { public AddDevicePreferenceController(Context context, String key) {
super(context, KEY); super(context, key);
mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED); mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter(); mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
} }
@@ -80,11 +78,6 @@ public class AddDevicePreferenceController extends BasePreferenceController
: DISABLED_UNSUPPORTED; : DISABLED_UNSUPPORTED;
} }
@Override
public String getPreferenceKey() {
return KEY;
}
@Override @Override
public CharSequence getSummary() { public CharSequence getSummary() {
return mBluetoothAdapter != null && mBluetoothAdapter.isEnabled() return mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()

3
tests/robotests/src/com/android/settings/connecteddevice/AddDevicePreferenceControllerTest.java
View File

@@ -73,7 +73,8 @@ public class AddDevicePreferenceControllerTest {
mContext.getPackageManager()); mContext.getPackageManager());
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true); mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
mAddDevicePreferenceController = new AddDevicePreferenceController(mContext); mAddDevicePreferenceController = new AddDevicePreferenceController(mContext,
"add_bt_devices");
ReflectionHelpers.setField(mAddDevicePreferenceController, ReflectionHelpers.setField(mAddDevicePreferenceController,
"mBluetoothAdapter", mBluetoothAdapter); "mBluetoothAdapter", mBluetoothAdapter);