Merge "Remove developer menu: AVDTP delay reports/inband ringing" into pi-dev (cc31240f) · Commits · e / os / android_packages_apps_Settings

res/values/strings.xml

+0 −10

Original line number	Diff line number	Diff line
		@@ -402,11 +402,6 @@
		<!-- Summary for bluetooth item in connection detail page. (phone)-->
		<string name="bluetooth_pref_summary" product="default">Allow your phone to communicate with nearby Bluetooth devices</string>

		<!-- Setting Checkbox title for disabling Bluetooth inband ringing in Development Settings -->
		<string name="bluetooth_disable_inband_ringing">Disable in-band ringing</string>
		<!-- Summary of checkbox for disabling Bluetooth inband ringing in Development Settings -->
		<string name="bluetooth_disable_inband_ringing_summary">Don’t play custom phone ringtones on Bluetooth headsets</string>

		<!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
		<string name="connected_device_available_media_title">Available media devices</string>
		<!-- Title for Bluetooth device group with media capability group [CHAR LIMIT=none]-->
		@@ -1691,15 +1686,10 @@
		<!-- Bluetooth settings. Dock Setting Dialog - Remember setting and don't ask user again -->
		<string name="bluetooth_dock_settings_remember">Remember settings</string>

		<!-- Bluetooth developer options. -->
		<!-- Bluetooth developer settings: Maximum number of connected audio devices -->
		<string name="bluetooth_max_connected_audio_devices_string">Maximum connected Bluetooth audio devices</string>
		<!-- Bluetooth developer settings: Maximum number of connected audio devices -->
		<string name="bluetooth_max_connected_audio_devices_dialog_title">Select maximum number of connected Bluetooth audio devices</string>
		<!-- Bluetooth developer settings: Checkbox title for disabling Bluetooth receiving AVDTP delay reports -->
		<string name="bluetooth_disable_avdtp_delay_reports">Disable Bluetooth AVDTP delay reports</string>
		<!-- Bluetooth developer settings: Summary of checkbox for disabling Bluetooth receiving AVDTP delay reports -->
		<string name="bluetooth_disable_avdtp_delay_reports_summary">Disallow receiving Bluetooth AVDTP delay reports</string>

		<!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
		<string name="wifi_display_settings_title">Cast</string>

res/xml/development_settings.xml

+0 −10

Original line number	Diff line number	Diff line
		@@ -254,16 +254,6 @@
		android:title="@string/bluetooth_disable_absolute_volume"
		android:summary="@string/bluetooth_disable_absolute_volume_summary" />

		<SwitchPreference
		android:key="bluetooth_disable_inband_ringing"
		android:title="@string/bluetooth_disable_inband_ringing"
		android:summary="@string/bluetooth_disable_inband_ringing_summary" />

		<SwitchPreference
		android:key="bluetooth_disable_avdtp_delay_reports"
		android:title="@string/bluetooth_disable_avdtp_delay_reports"
		android:summary="@string/bluetooth_disable_avdtp_delay_reports_summary"/>

		<ListPreference
		android:key="bluetooth_select_avrcp_version"
		android:title="@string/bluetooth_select_avrcp_version_string"

src/com/android/settings/development/BluetoothDelayReportsPreferenceController.java

deleted100644 → 0

+0 −69

Original line number	Diff line number	Diff line
		/*
		* 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.development;

		import android.content.Context;
		import android.os.SystemProperties;
		import android.support.annotation.VisibleForTesting;
		import android.support.v14.preference.SwitchPreference;
		import android.support.v7.preference.Preference;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.development.DeveloperOptionsPreferenceController;

		public class BluetoothDelayReportsPreferenceController extends DeveloperOptionsPreferenceController
		implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {

		private static final String BLUETOOTH_DISABLE_AVDTP_DELAY_REPORT_KEY =
		"bluetooth_disable_avdtp_delay_reports";
		@VisibleForTesting
		static final String BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY =
		"persist.bluetooth.disabledelayreports";

		public BluetoothDelayReportsPreferenceController(Context context) {
		super(context);
		}

		@Override
		public String getPreferenceKey() {
		return BLUETOOTH_DISABLE_AVDTP_DELAY_REPORT_KEY;
		}

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final boolean isDisabled = (Boolean) newValue;
		SystemProperties.set(BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY,
		isDisabled ? "true" : "false");
		return true;
		}

		@Override
		public void updateState(Preference preference) {
		final boolean isDisabled = SystemProperties.getBoolean(
		BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY, false /* default */);
		((SwitchPreference) mPreference).setChecked(isDisabled);
		}

		@Override
		protected void onDeveloperOptionsSwitchDisabled() {
		super.onDeveloperOptionsSwitchDisabled();
		// the default setting for this preference is the disabled state
		((SwitchPreference) mPreference).setChecked(false);
		SystemProperties.set(BLUETOOTH_DISABLE_AVDTP_DELAY_REPORTS_PROPERTY, "false");
		}

		}

src/com/android/settings/development/BluetoothInbandRingingPreferenceController.java

deleted100644 → 0

+0 −78

Original line number	Diff line number	Diff line
		/*
		* 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.development;

		import android.bluetooth.BluetoothHeadset;
		import android.content.Context;
		import android.os.SystemProperties;
		import android.support.annotation.VisibleForTesting;
		import android.support.v14.preference.SwitchPreference;
		import android.support.v7.preference.Preference;

		import com.android.settings.core.PreferenceControllerMixin;
		import com.android.settingslib.development.DeveloperOptionsPreferenceController;

		public class BluetoothInbandRingingPreferenceController extends DeveloperOptionsPreferenceController
		implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin {

		private static final String BLUETOOTH_DISABLE_INBAND_RINGING_KEY =
		"bluetooth_disable_inband_ringing";
		@VisibleForTesting
		static final String BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY =
		"persist.bluetooth.disableinbandringing";

		public BluetoothInbandRingingPreferenceController(Context context) {
		super(context);
		}

		@Override
		public boolean isAvailable() {
		return isInbandRingingSupported();
		}

		@Override
		public String getPreferenceKey() {
		return BLUETOOTH_DISABLE_INBAND_RINGING_KEY;
		}

		@Override
		public boolean onPreferenceChange(Preference preference, Object newValue) {
		final boolean isChecked = (Boolean) newValue;
		SystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY,
		isChecked ? "true" : "false");
		return true;
		}

		@Override
		public void updateState(Preference preference) {
		final boolean isEnabled = SystemProperties.getBoolean(
		BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false /* default */);
		((SwitchPreference) mPreference).setChecked(isEnabled);
		}

		@Override
		protected void onDeveloperOptionsSwitchDisabled() {
		super.onDeveloperOptionsSwitchDisabled();
		((SwitchPreference) mPreference).setChecked(false);
		SystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, "false");
		}

		@VisibleForTesting
		boolean isInbandRingingSupported() {
		return BluetoothHeadset.isInbandRingingSupported(mContext);
		}
		}

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -404,8 +404,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
		controllers.add(new TetheringHardwareAccelPreferenceController(context));
		controllers.add(new BluetoothDeviceNoNamePreferenceController(context));
		controllers.add(new BluetoothAbsoluteVolumePreferenceController(context));
		controllers.add(new BluetoothInbandRingingPreferenceController(context));
		controllers.add(new BluetoothDelayReportsPreferenceController(context));
		controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
		controllers.add(new BluetoothAudioCodecPreferenceController(context, lifecycle,
		bluetoothA2dpConfigStore));