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

Merge "Bluetooth: Use "Disable" in-band ringing instead of "Enable""

Browse Source
This commit is contained in:
Treehugger Robot
2018-01-05 20:41:01 +00:00
committed by Gerrit Code Review
parent 985b432fc0 7d563bd1de
commit 80c0656ca6
3 changed files with 26 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/values/strings.xml
View File

@@ -1601,6 +1601,11 @@
<!-- Bluetooth settings. Dock Setting Dialog - Remember setting and don't ask user again -->
<string name="bluetooth_dock_settings_remember">Remember settings</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>
<!-- Wifi Display settings. The title of the screen. [CHAR LIMIT=40] -->
<string name="wifi_display_settings_title">Cast</string>
<!-- Wifi Display settings. The title of a menu item to enable wireless display [CHAR LIMIT=40] -->

6
res/xml/development_prefs.xml
View File

@@ -224,9 +224,9 @@
android:summary="@string/bluetooth_disable_absolute_volume_summary"/>
<SwitchPreference
android:key="bluetooth_enable_inband_ringing"
android:title="@string/bluetooth_enable_inband_ringing"
android:summary="@string/bluetooth_enable_inband_ringing_summary"/>
android:key="bluetooth_disable_inband_ringing"
android:title="@string/bluetooth_disable_inband_ringing"
android:summary="@string/bluetooth_disable_inband_ringing_summary"/>
<ListPreference
android:key="bluetooth_select_avrcp_version"

40
src/com/android/settings/development/DevelopmentSettings.java
View File

@@ -210,12 +210,12 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
"persist.bluetooth.disableabsvol";
private static final String BLUETOOTH_AVRCP_VERSION_PROPERTY =
"persist.bluetooth.avrcpversion";
private static final String BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY =
"persist.bluetooth.enableinbandringing";
private static final String BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY =
"persist.bluetooth.disableinbandringing";
private static final String BLUETOOTH_BTSNOOP_ENABLE_PROPERTY =
"persist.bluetooth.btsnoopenable";
private static final String BLUETOOTH_ENABLE_INBAND_RINGING_KEY = "bluetooth_enable_inband_ringing";
private static final String BLUETOOTH_DISABLE_INBAND_RINGING_KEY = "bluetooth_disable_inband_ringing";
private static final String BLUETOOTH_SELECT_AVRCP_VERSION_KEY = "bluetooth_select_avrcp_version";
private static final String BLUETOOTH_SELECT_A2DP_CODEC_KEY = "bluetooth_select_a2dp_codec";
private static final String BLUETOOTH_SELECT_A2DP_SAMPLE_RATE_KEY = "bluetooth_select_a2dp_sample_rate";
@@ -291,7 +291,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
private SwitchPreference mTetheringHardwareOffload;
private SwitchPreference mBluetoothShowDevicesWithoutNames;
private SwitchPreference mBluetoothDisableAbsVolume;
private SwitchPreference mBluetoothEnableInbandRinging;
private SwitchPreference mBluetoothDisableInbandRinging;
private BluetoothA2dp mBluetoothA2dp;
private final Object mBluetoothA2dpLock = new Object();
@@ -513,10 +513,10 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mBluetoothShowDevicesWithoutNames =
findAndInitSwitchPref(BLUETOOTH_SHOW_DEVICES_WITHOUT_NAMES_KEY);
mBluetoothDisableAbsVolume = findAndInitSwitchPref(BLUETOOTH_DISABLE_ABSOLUTE_VOLUME_KEY);
mBluetoothEnableInbandRinging = findAndInitSwitchPref(BLUETOOTH_ENABLE_INBAND_RINGING_KEY);
mBluetoothDisableInbandRinging = findAndInitSwitchPref(BLUETOOTH_DISABLE_INBAND_RINGING_KEY);
if (!BluetoothHeadset.isInbandRingingSupported(getContext())) {
removePreference(mBluetoothEnableInbandRinging);
mBluetoothEnableInbandRinging = null;
removePreference(mBluetoothDisableInbandRinging);
mBluetoothDisableInbandRinging = null;
}
mBluetoothSelectAvrcpVersion = addListPreference(BLUETOOTH_SELECT_AVRCP_VERSION_KEY);
@@ -858,7 +858,7 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
}
updateBluetoothShowDevicesWithoutUserFriendlyNameOptions();
updateBluetoothDisableAbsVolumeOptions();
updateBluetoothEnableInbandRingingOptions();
updateBluetoothDisableInbandRingingOptions();
updateBluetoothA2dpConfigurationValues();
updatePrivateDnsSummary();
}
@@ -872,10 +872,6 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
onPreferenceTreeClick(cb);
}
}
if (mBluetoothEnableInbandRinging != null) {
mBluetoothEnableInbandRinging.setChecked(true);
onPreferenceTreeClick(mBluetoothEnableInbandRinging);
}
mBugReportInPowerController.resetPreference();
mEnableAdbController.resetPreference();
resetDebuggerOptions();
@@ -1523,17 +1519,17 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
mBluetoothDisableAbsVolume.isChecked() ? "true" : "false");
}
private void updateBluetoothEnableInbandRingingOptions() {
if (mBluetoothEnableInbandRinging != null) {
updateSwitchPreference(mBluetoothEnableInbandRinging,
SystemProperties.getBoolean(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY, true));
private void updateBluetoothDisableInbandRingingOptions() {
if (mBluetoothDisableInbandRinging != null) {
updateSwitchPreference(mBluetoothDisableInbandRinging,
SystemProperties.getBoolean(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY, false));
}
}
private void writeBluetoothEnableInbandRingingOptions() {
if (mBluetoothEnableInbandRinging != null) {
SystemProperties.set(BLUETOOTH_ENABLE_INBAND_RINGING_PROPERTY,
mBluetoothEnableInbandRinging.isChecked() ? "true" : "false");
private void writeBluetoothDisableInbandRingingOptions() {
if (mBluetoothDisableInbandRinging != null) {
SystemProperties.set(BLUETOOTH_DISABLE_INBAND_RINGING_PROPERTY,
mBluetoothDisableInbandRinging.isChecked() ? "true" : "false");
}
}
@@ -2592,8 +2588,8 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
writeBluetoothShowDevicesWithoutUserFriendlyNameOptions();
} else if (preference == mBluetoothDisableAbsVolume) {
writeBluetoothDisableAbsVolumeOptions();
} else if (preference == mBluetoothEnableInbandRinging) {
writeBluetoothEnableInbandRingingOptions();
} else if (preference == mBluetoothDisableInbandRinging) {
writeBluetoothDisableInbandRingingOptions();
} else if (SHORTCUT_MANAGER_RESET_KEY.equals(preference.getKey())) {
resetShortcutManagerThrottling();
} else {