diff --git a/res/values/strings.xml b/res/values/strings.xml index afa207b8f0f..952ac438915 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -243,6 +243,8 @@ This will end your connection with:<br><b>%1$s</b> You don\u2019t have permission to change Bluetooth settings. + + Pair a new device %1$s is visible to nearby devices while Bluetooth settings is open. diff --git a/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java new file mode 100644 index 00000000000..6409d3b3177 --- /dev/null +++ b/src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java @@ -0,0 +1,78 @@ +/* + * 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.Fragment; +import android.content.Context; +import android.support.v14.preference.PreferenceFragment; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.core.PreferenceController; +import com.android.settings.R; + + +/** + * Controller that shows and updates the bluetooth device name + */ +public class BluetoothPairingPreferenceController extends PreferenceController { + private static final String TAG = "BluetoothPairingPrefCtrl"; + + public static final String KEY_PAIRING = "pref_bt_pairing"; + private PreferenceFragment mFragment; + private Preference mPreference; + + public BluetoothPairingPreferenceController(Context context, PreferenceFragment fragment) { + super(context); + mFragment = fragment; + } + + @Override + public boolean isAvailable() { + return true; + } + + @Override + public String getPreferenceKey() { + return KEY_PAIRING; + } + + @Override + public boolean handlePreferenceTreeClick(Preference preference) { + if (KEY_PAIRING.equals(preference.getKey())) { + //TODO: open the pairing page + return true; + } + + return false; + } + + /** + * Create pairing preference to jump to pairing page + * + * @return bluetooth preference that created in this method + */ + public Preference createBluetoothPairingPreference() { + mPreference = new Preference(mFragment.getPreferenceScreen().getContext()); + mPreference.setKey(KEY_PAIRING); + mPreference.setIcon(R.drawable.ic_add); + mPreference.setTitle(R.string.bluetooth_pairing_pref_title); + + return mPreference; + } + +} diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index f3612f9bdc5..ed2629e297f 100644 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -94,6 +94,7 @@ public class BluetoothSettings extends DeviceListPreferenceFragment implements I private PreferenceGroup mPairedDevicesCategory; private PreferenceGroup mAvailableDevicesCategory; private Preference mDeviceNamePreference; + private Preference mPairingPreference; private boolean mAvailableDevicesCategoryIsPresent; private boolean mInitialScanStarted; @@ -103,6 +104,7 @@ public class BluetoothSettings extends DeviceListPreferenceFragment implements I private final IntentFilter mIntentFilter; private BluetoothDeviceNamePreferenceController mDeviceNamePrefController; + private BluetoothPairingPreferenceController mPairingPrefController; // For Search private static final String DATA_KEY_REFERENCE = "main_toggle_bluetooth"; @@ -175,6 +177,8 @@ public class BluetoothSettings extends DeviceListPreferenceFragment implements I mMyDevicePreference = mFooterPreferenceMixin.createFooterPreference(); mMyDevicePreference.setSelectable(false); + mPairingPreference = mPairingPrefController.createBluetoothPairingPreference(); + setHasOptionsMenu(true); } @@ -323,6 +327,7 @@ public class BluetoothSettings extends DeviceListPreferenceFragment implements I addDeviceCategory(mPairedDevicesCategory, R.string.bluetooth_preference_paired_devices, BluetoothDeviceFilter.BONDED_DEVICE_FILTER, true); + mPairedDevicesCategory.addPreference(mPairingPreference); int numberOfPairedDevices = mPairedDevicesCategory.getPreferenceCount(); if (isUiRestricted() || numberOfPairedDevices <= 0) { @@ -523,7 +528,9 @@ public class BluetoothSettings extends DeviceListPreferenceFragment implements I List controllers = new ArrayList<>(); mDeviceNamePrefController = new BluetoothDeviceNamePreferenceController(context, this, getLifecycle()); + mPairingPrefController = new BluetoothPairingPreferenceController(context, this); controllers.add(mDeviceNamePrefController); + controllers.add(mPairingPrefController); return controllers; } diff --git a/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java new file mode 100644 index 00000000000..24325b31ffe --- /dev/null +++ b/tests/robotests/src/com/android/settings/bluetooth/BluetoothPairingPreferenceControllerTest.java @@ -0,0 +1,85 @@ +/* + * 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 static com.google.common.truth.Truth.assertThat; + +import static org.mockito.Mockito.when; + +import android.app.FragmentManager; +import android.app.FragmentTransaction; +import android.content.Context; +import android.support.v14.preference.PreferenceFragment; +import android.support.v7.preference.Preference; +import android.support.v7.preference.PreferenceScreen; + +import com.android.settings.SettingsRobolectricTestRunner; +import com.android.settings.TestConfig; +import com.android.settings.R; +import com.android.settingslib.bluetooth.LocalBluetoothAdapter; +import com.android.settingslib.core.lifecycle.Lifecycle; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Answers; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; + +@RunWith(SettingsRobolectricTestRunner.class) +@Config(manifest = TestConfig.MANIFEST_PATH, sdk = TestConfig.SDK_VERSION) +public class BluetoothPairingPreferenceControllerTest { + + private Context mContext; + @Mock(answer = Answers.RETURNS_DEEP_STUBS) + private PreferenceFragment mFragment; + @Mock + private Lifecycle mLifecycle; + @Mock + private LocalBluetoothAdapter mLocalAdapter; + @Mock + private FragmentManager mFragmentManager; + @Mock + private FragmentTransaction mFragmentTransaction; + @Mock + private PreferenceScreen mPreferenceScreen; + private Preference mPreference; + + private BluetoothPairingPreferenceController mController; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + + mContext = RuntimeEnvironment.application; + when(mFragment.getPreferenceScreen().getContext()).thenReturn(mContext); + + mController = new BluetoothPairingPreferenceController(mContext, mFragment); + } + + @Test + public void testCreateBluetoothPairingPreference() { + Preference pref = mController.createBluetoothPairingPreference(); + + assertThat(pref.getKey()).isEqualTo(BluetoothPairingPreferenceController.KEY_PAIRING); + assertThat(pref.getIcon()).isEqualTo(mContext.getDrawable(R.drawable.ic_add)); + assertThat(pref.getTitle()).isEqualTo( + mContext.getString(R.string.bluetooth_pairing_pref_title)); + } +}