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

Merge "Apply new preference and controller for Bluetooth developer option"

Browse Source
This commit is contained in:
tim peng
2019-12-16 01:24:53 +00:00
committed by Android (Google) Code Review
parent 02bb6e7e6e 548e927ed9
commit 8e25a3a658
14 changed files with 74 additions and 1168 deletions
Download Patch File Download Diff File Expand all files Collapse all files

102
src/com/android/settings/development/BluetoothAudioBitsPerSamplePreferenceController.java
View File

@@ -1,102 +0,0 @@
/*
* 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.BluetoothCodecConfig;
import android.content.Context;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class BluetoothAudioBitsPerSamplePreferenceController extends
AbstractBluetoothA2dpPreferenceController {
private static final int DEFAULT_INDEX = 0;
private static final String BLUETOOTH_SELECT_A2DP_BITS_PER_SAMPLE_KEY =
"bluetooth_select_a2dp_bits_per_sample";
public BluetoothAudioBitsPerSamplePreferenceController(Context context, Lifecycle lifecycle,
BluetoothA2dpConfigStore store) {
super(context, lifecycle, store);
}
@Override
public String getPreferenceKey() {
return BLUETOOTH_SELECT_A2DP_BITS_PER_SAMPLE_KEY;
}
@Override
protected String[] getListValues() {
return mContext.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_bits_per_sample_values);
}
@Override
protected String[] getListSummaries() {
return mContext.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_bits_per_sample_summaries);
}
@Override
protected int getDefaultIndex() {
return DEFAULT_INDEX;
}
@Override
protected void writeConfigurationValues(Object newValue) {
final int index = mPreference.findIndexOfValue(newValue.toString());
int bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_NONE; // default
switch (index) {
case 0:
// Reset to default
break;
case 1:
bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_16;
break;
case 2:
bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_24;
break;
case 3:
bitsPerSampleValue = BluetoothCodecConfig.BITS_PER_SAMPLE_32;
break;
default:
break;
}
mBluetoothA2dpConfigStore.setBitsPerSample(bitsPerSampleValue);
}
@Override
protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) {
final int bitsPerSample = config.getBitsPerSample();
int index = DEFAULT_INDEX;
switch (bitsPerSample) {
case BluetoothCodecConfig.BITS_PER_SAMPLE_16:
index = 1;
break;
case BluetoothCodecConfig.BITS_PER_SAMPLE_24:
index = 2;
break;
case BluetoothCodecConfig.BITS_PER_SAMPLE_32:
index = 3;
break;
case BluetoothCodecConfig.BITS_PER_SAMPLE_NONE:
default:
break;
}
return index;
}
}

96
src/com/android/settings/development/BluetoothAudioChannelModePreferenceController.java
View File

@@ -1,96 +0,0 @@
/*
* 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.BluetoothCodecConfig;
import android.content.Context;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class BluetoothAudioChannelModePreferenceController extends
AbstractBluetoothA2dpPreferenceController {
private static final int DEFAULT_INDEX = 0;
private static final String BLUETOOTH_SELECT_A2DP_CHANNEL_MODE_KEY =
"bluetooth_select_a2dp_channel_mode";
public BluetoothAudioChannelModePreferenceController(Context context, Lifecycle lifecycle,
BluetoothA2dpConfigStore store) {
super(context, lifecycle, store);
}
@Override
public String getPreferenceKey() {
return BLUETOOTH_SELECT_A2DP_CHANNEL_MODE_KEY;
}
@Override
protected String[] getListValues() {
return mContext.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_channel_mode_values);
}
@Override
protected String[] getListSummaries() {
return mContext.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_channel_mode_summaries);
}
@Override
protected int getDefaultIndex() {
return DEFAULT_INDEX;
}
@Override
protected void writeConfigurationValues(Object newValue) {
final int index = mPreference.findIndexOfValue(newValue.toString());
int channelModeValue = BluetoothCodecConfig.CHANNEL_MODE_NONE; // default
switch (index) {
case 0:
// Reset to default
break;
case 1:
channelModeValue = BluetoothCodecConfig.CHANNEL_MODE_MONO;
break;
case 2:
channelModeValue = BluetoothCodecConfig.CHANNEL_MODE_STEREO;
break;
default:
break;
}
mBluetoothA2dpConfigStore.setChannelMode(channelModeValue);
}
@Override
protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) {
final int channelMode = config.getChannelMode();
int index = DEFAULT_INDEX;
switch (channelMode) {
case BluetoothCodecConfig.CHANNEL_MODE_MONO:
index = 1;
break;
case BluetoothCodecConfig.CHANNEL_MODE_STEREO:
index = 2;
break;
case BluetoothCodecConfig.CHANNEL_MODE_NONE:
default:
break;
}
return index;
}
}

156
src/com/android/settings/development/BluetoothAudioCodecPreferenceController.java
View File

@@ -1,156 +0,0 @@
/*
* 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.BluetoothCodecConfig;
import android.content.Context;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class BluetoothAudioCodecPreferenceController extends
AbstractBluetoothA2dpPreferenceController {
private static final int DEFAULT_INDEX = 0;
private static final String BLUETOOTH_SELECT_A2DP_CODEC_KEY = "bluetooth_select_a2dp_codec";
public BluetoothAudioCodecPreferenceController(Context context, Lifecycle lifecycle,
BluetoothA2dpConfigStore store) {
super(context, lifecycle, store);
}
@Override
public String getPreferenceKey() {
return BLUETOOTH_SELECT_A2DP_CODEC_KEY;
}
@Override
protected String[] getListValues() {
return mContext.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_values);
}
@Override
protected String[] getListSummaries() {
return mContext.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_summaries);
}
@Override
protected int getDefaultIndex() {
return DEFAULT_INDEX;
}
@Override
protected void writeConfigurationValues(Object newValue) {
final int index = mPreference.findIndexOfValue(newValue.toString());
int codecTypeValue = BluetoothCodecConfig.SAMPLE_RATE_NONE; // default
int codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_DEFAULT;
switch (index) {
case 0:
// Reset the priority of the current codec to default
final String oldValue = mPreference.getValue();
switch (mPreference.findIndexOfValue(oldValue)) {
case 0:
break; // No current codec
case 1:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC;
break;
case 2:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC;
break;
case 3:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;
break;
case 4:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;
break;
case 5:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;
break;
default:
break;
}
break;
case 1:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC;
codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
break;
case 2:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC;
codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
break;
case 3:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX;
codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
break;
case 4:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD;
codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
break;
case 5:
codecTypeValue = BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC;
codecPriorityValue = BluetoothCodecConfig.CODEC_PRIORITY_HIGHEST;
break;
case 6:
synchronized (mBluetoothA2dpConfigStore) {
if (mBluetoothA2dp != null) {
mBluetoothA2dp.enableOptionalCodecs(null); // Use current active device
}
}
return;
case 7:
synchronized (mBluetoothA2dpConfigStore) {
if (mBluetoothA2dp != null) {
mBluetoothA2dp.disableOptionalCodecs(null); // Use current active device
}
}
return;
default:
break;
}
mBluetoothA2dpConfigStore.setCodecType(codecTypeValue);
mBluetoothA2dpConfigStore.setCodecPriority(codecPriorityValue);
}
@Override
protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) {
final int codecType = config.getCodecType();
int index = DEFAULT_INDEX;
switch (codecType) {
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_SBC:
index = 1;
break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_AAC:
index = 2;
break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX:
index = 3;
break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_APTX_HD:
index = 4;
break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_LDAC:
index = 5;
break;
case BluetoothCodecConfig.SOURCE_CODEC_TYPE_INVALID:
default:
break;
}
return index;
}
}

100
src/com/android/settings/development/BluetoothAudioQualityPreferenceController.java
View File

@@ -1,100 +0,0 @@
/*
* 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.BluetoothCodecConfig;
import android.content.Context;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class BluetoothAudioQualityPreferenceController extends
AbstractBluetoothA2dpPreferenceController {
private static final int DEFAULT_INDEX = 3;
private static final String BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY =
"bluetooth_select_a2dp_ldac_playback_quality";
public BluetoothAudioQualityPreferenceController(Context context, Lifecycle lifecycle,
BluetoothA2dpConfigStore store) {
super(context, lifecycle, store);
}
@Override
public String getPreferenceKey() {
return BLUETOOTH_SELECT_A2DP_LDAC_PLAYBACK_QUALITY_KEY;
}
@Override
protected String[] getListValues() {
return mContext.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_ldac_playback_quality_values);
}
@Override
protected String[] getListSummaries() {
return mContext.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_ldac_playback_quality_summaries);
}
@Override
protected int getDefaultIndex() {
return DEFAULT_INDEX;
}
@Override
protected void writeConfigurationValues(Object newValue) {
final int index = mPreference.findIndexOfValue(newValue.toString());
int codecSpecific1Value = 0; // default
switch (index) {
case 0:
case 1:
case 2:
case 3:
codecSpecific1Value = 1000 + index;
break;
default:
break;
}
mBluetoothA2dpConfigStore.setCodecSpecific1Value(codecSpecific1Value);
}
@Override
protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) {
// The actual values are 0, 1, 2 - those are extracted
// as mod-10 remainders of a larger value.
// The reason is because within BluetoothCodecConfig we cannot use
// a codec-specific value of zero.
int index = (int) config.getCodecSpecific1();
if (index > 0) {
index %= 10;
} else {
index = DEFAULT_INDEX;
}
switch (index) {
case 0:
case 1:
case 2:
case 3:
break;
default:
index = DEFAULT_INDEX;
break;
}
return index;
}
}

110
src/com/android/settings/development/BluetoothAudioSampleRatePreferenceController.java
View File

@@ -1,110 +0,0 @@
/*
* 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.BluetoothCodecConfig;
import android.content.Context;
import com.android.settings.R;
import com.android.settingslib.core.lifecycle.Lifecycle;
public class BluetoothAudioSampleRatePreferenceController extends
AbstractBluetoothA2dpPreferenceController {
private static final int DEFAULT_INDEX = 0;
private static final String BLUETOOTH_SELECT_A2DP_SAMPLE_RATE_KEY =
"bluetooth_select_a2dp_sample_rate";
public BluetoothAudioSampleRatePreferenceController(Context context, Lifecycle lifecycle,
BluetoothA2dpConfigStore store) {
super(context, lifecycle, store);
}
@Override
public String getPreferenceKey() {
return BLUETOOTH_SELECT_A2DP_SAMPLE_RATE_KEY;
}
@Override
protected String[] getListValues() {
return mContext.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_sample_rate_values);
}
@Override
protected String[] getListSummaries() {
return mContext.getResources().getStringArray(
R.array.bluetooth_a2dp_codec_sample_rate_summaries);
}
@Override
protected int getDefaultIndex() {
return DEFAULT_INDEX;
}
@Override
protected void writeConfigurationValues(Object newValue) {
final int index = mPreference.findIndexOfValue(newValue.toString());
int sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_NONE; // default
switch (index) {
case 0:
sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_NONE;
break;
case 1:
sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_44100;
break;
case 2:
sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_48000;
break;
case 3:
sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_88200;
break;
case 4:
sampleRateValue = BluetoothCodecConfig.SAMPLE_RATE_96000;
break;
default:
break;
}
mBluetoothA2dpConfigStore.setSampleRate(sampleRateValue);
}
@Override
protected int getCurrentA2dpSettingIndex(BluetoothCodecConfig config) {
final int sampleRate = config.getSampleRate();
int index = DEFAULT_INDEX;
switch (sampleRate) {
case BluetoothCodecConfig.SAMPLE_RATE_44100:
index = 1;
break;
case BluetoothCodecConfig.SAMPLE_RATE_48000:
index = 2;
break;
case BluetoothCodecConfig.SAMPLE_RATE_88200:
index = 3;
break;
case BluetoothCodecConfig.SAMPLE_RATE_96000:
index = 4;
break;
case BluetoothCodecConfig.SAMPLE_RATE_176400:
case BluetoothCodecConfig.SAMPLE_RATE_192000:
case BluetoothCodecConfig.SAMPLE_RATE_NONE:
default:
break;
}
return index;
}
}

55
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -44,6 +44,14 @@ import com.android.settings.Utils;
import com.android.settings.dashboard.RestrictedDashboardFragment;
import com.android.settings.development.autofill.AutofillLoggingLevelPreferenceController;
import com.android.settings.development.autofill.AutofillResetOptionsPreferenceController;
import com.android.settings.development.bluetooth.AbstractBluetoothDialogPreferenceController;
import com.android.settings.development.bluetooth.AbstractBluetoothPreferenceController;
import com.android.settings.development.bluetooth.BluetoothBitPerSampleDialogPreferenceController;
import com.android.settings.development.bluetooth.BluetoothChannelModeDialogPreferenceController;
import com.android.settings.development.bluetooth.BluetoothCodecDialogPreferenceController;
import com.android.settings.development.bluetooth.BluetoothHDAudioPreferenceController;
import com.android.settings.development.bluetooth.BluetoothQualityDialogPreferenceController;
import com.android.settings.development.bluetooth.BluetoothSampleRateDialogPreferenceController;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.widget.SwitchBar;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -62,7 +70,8 @@ import java.util.List;
public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFragment
implements SwitchBar.OnSwitchChangeListener, OemUnlockDialogHost, AdbDialogHost,
AdbClearKeysDialogHost, LogPersistDialogHost,
BluetoothA2dpHwOffloadRebootDialog.OnA2dpHwDialogConfirmedListener {
BluetoothA2dpHwOffloadRebootDialog.OnA2dpHwDialogConfirmedListener,
AbstractBluetoothPreferenceController.Callback {
private static final String TAG = "DevSettingsDashboard";
@@ -455,16 +464,6 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new BluetoothAbsoluteVolumePreferenceController(context));
controllers.add(new BluetoothAvrcpVersionPreferenceController(context));
controllers.add(new BluetoothA2dpHwOffloadPreferenceController(context, fragment));
controllers.add(new BluetoothAudioCodecPreferenceController(context, lifecycle,
bluetoothA2dpConfigStore));
controllers.add(new BluetoothAudioSampleRatePreferenceController(context, lifecycle,
bluetoothA2dpConfigStore));
controllers.add(new BluetoothAudioBitsPerSamplePreferenceController(context, lifecycle,
bluetoothA2dpConfigStore));
controllers.add(new BluetoothAudioChannelModePreferenceController(context, lifecycle,
bluetoothA2dpConfigStore));
controllers.add(new BluetoothAudioQualityPreferenceController(context, lifecycle,
bluetoothA2dpConfigStore));
controllers.add(new BluetoothMaxConnectedAudioDevicesPreferenceController(context));
controllers.add(new ShowTapsPreferenceController(context));
controllers.add(new PointerLocationPreferenceController(context));
@@ -511,6 +510,19 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
controllers.add(new DefaultLaunchPreferenceController(context, "inactive_apps"));
controllers.add(new AutofillLoggingLevelPreferenceController(context, lifecycle));
controllers.add(new AutofillResetOptionsPreferenceController(context));
controllers.add(new BluetoothCodecDialogPreferenceController(context, lifecycle,
bluetoothA2dpConfigStore, fragment));
controllers.add(new BluetoothSampleRateDialogPreferenceController(context, lifecycle,
bluetoothA2dpConfigStore));
controllers.add(new BluetoothBitPerSampleDialogPreferenceController(context, lifecycle,
bluetoothA2dpConfigStore));
controllers.add(new BluetoothQualityDialogPreferenceController(context, lifecycle,
bluetoothA2dpConfigStore));
controllers.add(new BluetoothChannelModeDialogPreferenceController(context, lifecycle,
bluetoothA2dpConfigStore));
controllers.add(new BluetoothHDAudioPreferenceController(context, lifecycle,
bluetoothA2dpConfigStore, fragment));
return controllers;
}
@@ -519,6 +531,27 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
return use(clazz);
}
@Override
public void onBluetoothCodecChanged() {
for (AbstractPreferenceController controller : mPreferenceControllers) {
if (controller instanceof AbstractBluetoothDialogPreferenceController
&& !(controller instanceof BluetoothCodecDialogPreferenceController)) {
((AbstractBluetoothDialogPreferenceController) controller)
.onBluetoothCodecUpdated();
}
}
}
@Override
public void onBluetoothHDAudioEnabled(boolean enabled) {
for (AbstractPreferenceController controller : mPreferenceControllers) {
if (controller instanceof AbstractBluetoothDialogPreferenceController) {
((AbstractBluetoothDialogPreferenceController) controller).onHDAudioEnabled(
enabled);
}
}
}
/**
* For Search.
*/

2
src/com/android/settings/development/bluetooth/BluetoothQualityDialogPreferenceController.java
View File

@@ -106,7 +106,7 @@ public class BluetoothQualityDialogPreferenceController extends
@Override
public void onHDAudioEnabled(boolean enabled) {
mPreference.setEnabled(false);
};
}
@VisibleForTesting
int convertCfgToBtnIndex(int config) {