Subtext of "Add device" should only show when BT is off
Bug: 73960246 Test: Manual test & make RunSettingsRoboTests Change-Id: I6eb5fbed20a4ffc923faf992bbf0b30a817444a0
This commit is contained in:
@@ -36,7 +36,8 @@
|
||||
android:summary="@string/connected_device_add_device_summary"
|
||||
settings:allowDividerAbove="true"
|
||||
settings:userRestriction="no_config_bluetooth"
|
||||
settings:useAdminDisabledSummary="true"/>
|
||||
settings:useAdminDisabledSummary="true"
|
||||
settings:controller="com.android.settings.connecteddevice.AddDevicePreferenceController"/>
|
||||
|
||||
<Preference
|
||||
android:fragment="com.android.settings.connecteddevice.AdvancedConnectedDeviceDashboardFragment"
|
||||
|
@@ -0,0 +1,98 @@
|
||||
/*
|
||||
* Copyright (C) 2018 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.connecteddevice;
|
||||
|
||||
import android.bluetooth.BluetoothAdapter;
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.IntentFilter;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.R;
|
||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||
import com.android.settingslib.core.lifecycle.events.OnStart;
|
||||
import com.android.settingslib.core.lifecycle.events.OnStop;
|
||||
|
||||
/**
|
||||
* Controller to maintain the {@link android.support.v7.preference.Preference} for add
|
||||
* device. It monitor Bluetooth's status(on/off) and decide if need to show summary or not.
|
||||
*/
|
||||
public class AddDevicePreferenceController extends BasePreferenceController
|
||||
implements LifecycleObserver, OnStart, OnStop {
|
||||
|
||||
private static final String KEY = "add_bt_devices";
|
||||
|
||||
private Preference mPreference;
|
||||
private final BroadcastReceiver mReceiver = new BroadcastReceiver() {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
updateState();
|
||||
}
|
||||
};
|
||||
private IntentFilter mIntentFilter;
|
||||
private BluetoothAdapter mBluetoothAdapter;
|
||||
|
||||
public AddDevicePreferenceController(Context context) {
|
||||
super(context, KEY);
|
||||
mIntentFilter = new IntentFilter(BluetoothAdapter.ACTION_STATE_CHANGED);
|
||||
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStart() {
|
||||
mContext.registerReceiver(mReceiver, mIntentFilter);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onStop() {
|
||||
mContext.unregisterReceiver(mReceiver);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
if (isAvailable()) {
|
||||
mPreference = (Preference) screen.findPreference(getPreferenceKey());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
return mContext.getPackageManager().hasSystemFeature(PackageManager.FEATURE_BLUETOOTH)
|
||||
? AVAILABLE
|
||||
: DISABLED_UNSUPPORTED;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String getPreferenceKey() {
|
||||
return KEY;
|
||||
}
|
||||
|
||||
@Override
|
||||
public CharSequence getSummary() {
|
||||
return mBluetoothAdapter != null && mBluetoothAdapter.isEnabled()
|
||||
? ""
|
||||
: mContext.getString(R.string.connected_device_add_device_summary);
|
||||
}
|
||||
|
||||
void updateState() {
|
||||
updateState(mPreference);
|
||||
}
|
||||
}
|
@@ -0,0 +1,132 @@
|
||||
/*
|
||||
* Copyright (C) 2018 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.connecteddevice;
|
||||
|
||||
import static com.android.settings.core.BasePreferenceController.AVAILABLE;
|
||||
import static com.android.settings.core.BasePreferenceController.DISABLED_UNSUPPORTED;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static junit.framework.Assert.assertTrue;
|
||||
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.bluetooth.BluetoothAdapter;
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.Context;
|
||||
import android.content.Intent;
|
||||
import android.content.pm.PackageManager;
|
||||
import android.support.v7.preference.Preference;
|
||||
import android.support.v7.preference.PreferenceManager;
|
||||
import android.support.v7.preference.PreferenceScreen;
|
||||
import android.text.TextUtils;
|
||||
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.testutils.SettingsRobolectricTestRunner;
|
||||
import com.android.settingslib.RestrictedPreference;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoAnnotations;
|
||||
import org.robolectric.RuntimeEnvironment;
|
||||
import org.robolectric.Shadows;
|
||||
import org.robolectric.annotation.Config;
|
||||
import org.robolectric.shadows.ShadowApplicationPackageManager;
|
||||
import org.robolectric.util.ReflectionHelpers;
|
||||
|
||||
@RunWith(SettingsRobolectricTestRunner.class)
|
||||
@Config(shadows = ShadowApplicationPackageManager.class)
|
||||
public class AddDevicePreferenceControllerTest {
|
||||
|
||||
@Mock
|
||||
private PreferenceScreen mScreen;
|
||||
@Mock
|
||||
private BluetoothAdapter mBluetoothAdapter;
|
||||
|
||||
private Context mContext;
|
||||
private AddDevicePreferenceController mAddDevicePreferenceController;
|
||||
private RestrictedPreference mAddDevicePreference;
|
||||
private ShadowApplicationPackageManager mPackageManager;
|
||||
|
||||
|
||||
@Before
|
||||
public void setUp() {
|
||||
MockitoAnnotations.initMocks(this);
|
||||
|
||||
mContext = RuntimeEnvironment.application;
|
||||
mPackageManager = (ShadowApplicationPackageManager) Shadows.shadowOf(
|
||||
mContext.getPackageManager());
|
||||
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
|
||||
|
||||
mAddDevicePreferenceController = new AddDevicePreferenceController(mContext);
|
||||
ReflectionHelpers.setField(mAddDevicePreferenceController,
|
||||
"mBluetoothAdapter", mBluetoothAdapter);
|
||||
|
||||
String key = mAddDevicePreferenceController.getPreferenceKey();
|
||||
mAddDevicePreference = new RestrictedPreference(mContext);
|
||||
mAddDevicePreference.setKey(key);
|
||||
when(mScreen.findPreference(key)).thenReturn(mAddDevicePreference);
|
||||
mAddDevicePreferenceController.displayPreference(mScreen);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void addDevice_bt_resume_on_then_off() {
|
||||
when(mBluetoothAdapter.isEnabled()).thenReturn(true);
|
||||
mAddDevicePreferenceController.updateState();
|
||||
assertTrue(TextUtils.isEmpty(mAddDevicePreference.getSummary()));
|
||||
|
||||
Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
|
||||
intent.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_OFF);
|
||||
BroadcastReceiver receiver = ReflectionHelpers.getField(
|
||||
mAddDevicePreferenceController, "mReceiver");
|
||||
when(mBluetoothAdapter.isEnabled()).thenReturn(false);
|
||||
receiver.onReceive(mContext, intent);
|
||||
assertThat(mAddDevicePreference.getSummary()).isEqualTo(
|
||||
mContext.getString(R.string.connected_device_add_device_summary));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void addDevice_bt_resume_off_then_on() {
|
||||
when(mBluetoothAdapter.isEnabled()).thenReturn(false);
|
||||
mAddDevicePreferenceController.updateState();
|
||||
assertThat(mAddDevicePreference.getSummary()).isEqualTo(
|
||||
mContext.getString(R.string.connected_device_add_device_summary));
|
||||
|
||||
Intent intent = new Intent(BluetoothAdapter.ACTION_STATE_CHANGED);
|
||||
intent.putExtra(BluetoothAdapter.EXTRA_STATE, BluetoothAdapter.STATE_ON);
|
||||
BroadcastReceiver receiver = ReflectionHelpers.getField(
|
||||
mAddDevicePreferenceController, "mReceiver");
|
||||
when(mBluetoothAdapter.isEnabled()).thenReturn(true);
|
||||
receiver.onReceive(mContext, intent);
|
||||
assertTrue(TextUtils.isEmpty(mAddDevicePreference.getSummary()));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void addDevice_Availability_UnSupported() {
|
||||
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, false);
|
||||
assertThat(mAddDevicePreferenceController.getAvailabilityStatus())
|
||||
.isEqualTo(DISABLED_UNSUPPORTED);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void addDevice_Availability_Supported() {
|
||||
mPackageManager.setSystemFeature(PackageManager.FEATURE_BLUETOOTH, true);
|
||||
assertThat(mAddDevicePreferenceController.getAvailabilityStatus())
|
||||
.isEqualTo(AVAILABLE);
|
||||
}
|
||||
}
|
Reference in New Issue
Block a user