From 018fe5adf54573adaaaa9b11dd274d182a4f703f Mon Sep 17 00:00:00 2001 From: Fan Zhang Date: Wed, 7 Nov 2018 15:10:15 -0800 Subject: [PATCH] Clean up bluetooth while driving code. Test: robotests Change-Id: I50aedc61a9a7836672e934e188837dbe49c64be2 --- res/values/strings.xml | 5 -- res/xml/connected_devices_advanced.xml | 8 --- .../AdvancedConnectedDeviceDashboardFragment.java | 1 - ...luetoothOnWhileDrivingPreferenceController.java | 59 ------------------- src/com/android/settings/core/FeatureFlags.java | 1 - ...oothOnWhileDrivingPreferenceControllerTest.java | 67 ---------------------- 6 files changed, 141 deletions(-) delete mode 100644 src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java delete mode 100644 tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index e14135ccd7..4b1e1f2ff8 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10010,11 +10010,6 @@ Device name - - Use Bluetooth when driving - - Turn on Bluetooth automatically when driving - Wi-Fi control diff --git a/res/xml/connected_devices_advanced.xml b/res/xml/connected_devices_advanced.xml index a959d02405..b5d2a999e4 100644 --- a/res/xml/connected_devices_advanced.xml +++ b/res/xml/connected_devices_advanced.xml @@ -44,14 +44,6 @@ android:icon="@drawable/ic_android" android:order="-6"/> - - controllers = new ArrayList<>(); controllers.add(new BluetoothFilesPreferenceController(context)); - controllers.add(new BluetoothOnWhileDrivingPreferenceController(context)); final PrintSettingPreferenceController printerController = new PrintSettingPreferenceController(context); diff --git a/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java b/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java deleted file mode 100644 index 6d4e8b848b..0000000000 --- a/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceController.java +++ /dev/null @@ -1,59 +0,0 @@ -/* - * 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.content.Context; -import android.provider.Settings; -import android.util.FeatureFlagUtils; - -import com.android.settings.core.FeatureFlags; -import com.android.settings.core.PreferenceControllerMixin; -import com.android.settings.core.TogglePreferenceController; - -/** Handles a toggle for a setting to turn on Bluetooth while driving. * */ -public class BluetoothOnWhileDrivingPreferenceController extends TogglePreferenceController - implements PreferenceControllerMixin { - static final String KEY_BLUETOOTH_ON_DRIVING = "bluetooth_on_while_driving"; - - public BluetoothOnWhileDrivingPreferenceController(Context context) { - super(context, KEY_BLUETOOTH_ON_DRIVING); - } - - @Override - public int getAvailabilityStatus() { - if (FeatureFlagUtils.isEnabled(mContext, FeatureFlags.BLUETOOTH_WHILE_DRIVING)) { - return AVAILABLE; - } - return CONDITIONALLY_UNAVAILABLE; - } - - @Override - public boolean isChecked() { - return Settings.Secure.getInt( - mContext.getContentResolver(), - Settings.Secure.BLUETOOTH_ON_WHILE_DRIVING, - 0) - != 0; - } - - @Override - public boolean setChecked(boolean isChecked) { - final int value = isChecked ? 1 : 0; - return Settings.Secure.putInt( - mContext.getContentResolver(), Settings.Secure.BLUETOOTH_ON_WHILE_DRIVING, value); - } -} diff --git a/src/com/android/settings/core/FeatureFlags.java b/src/com/android/settings/core/FeatureFlags.java index 811f7ade83..0a26b79c93 100644 --- a/src/com/android/settings/core/FeatureFlags.java +++ b/src/com/android/settings/core/FeatureFlags.java @@ -20,7 +20,6 @@ package com.android.settings.core; * This class keeps track of all feature flags in Settings. */ public class FeatureFlags { - public static final String BLUETOOTH_WHILE_DRIVING = "settings_bluetooth_while_driving"; public static final String AUDIO_SWITCHER_SETTINGS = "settings_audio_switcher"; public static final String DYNAMIC_HOMEPAGE = "settings_dynamic_homepage"; public static final String HEARING_AID_SETTINGS = "settings_bluetooth_hearing_aid"; diff --git a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java deleted file mode 100644 index 83763bb414..0000000000 --- a/tests/robotests/src/com/android/settings/connecteddevice/BluetoothOnWhileDrivingPreferenceControllerTest.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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.google.common.truth.Truth.assertThat; - -import android.content.Context; -import android.provider.Settings; -import android.provider.Settings.Secure; -import android.util.FeatureFlagUtils; - -import com.android.settings.core.BasePreferenceController; -import com.android.settings.core.FeatureFlags; -import com.android.settings.testutils.SettingsRobolectricTestRunner; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.robolectric.RuntimeEnvironment; - -@RunWith(SettingsRobolectricTestRunner.class) -public class BluetoothOnWhileDrivingPreferenceControllerTest { - - private BluetoothOnWhileDrivingPreferenceController mController; - private Context mContext; - - @Before - public void setUp() { - mContext = RuntimeEnvironment.application; - mController = new BluetoothOnWhileDrivingPreferenceController(mContext); - } - - @Test - public void getAvailabilityStatus_onWhenEnabled() { - FeatureFlagUtils.setEnabled(mContext, FeatureFlags.BLUETOOTH_WHILE_DRIVING, true); - - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.AVAILABLE); - } - - @Test - public void getAvailabilityStatus_offWhenDisabled() { - assertThat(mController.getAvailabilityStatus()) - .isEqualTo(BasePreferenceController.CONDITIONALLY_UNAVAILABLE); - } - - @Test - public void setChecked_togglesSettingSecure() { - mController.setChecked(true); - - final String name = Secure.BLUETOOTH_ON_WHILE_DRIVING; - assertThat(Settings.Secure.getInt(mContext.getContentResolver(), name, 0)).isEqualTo(1); - } -} -- 2.11.0