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

am 15c27bb4: Merge "fix dock audio enable dialog" into jb-mr1.1-dev

Browse Source 
* commit '15c27bb40bc493e898442e8e4ac9b52dd89dae58':
  fix dock audio enable dialog
This commit is contained in:
Eric Laurent
2012-11-16 14:07:07 -08:00
committed by Android Git Automerger
parent 0aa79c7394 15c27bb40b
commit ccc1d61489
1 changed files with 23 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/com/android/settings/bluetooth/DockService.java
View File

@@ -120,6 +120,8 @@ public final class DockService extends Service implements ServiceListener {
private int mPendingTurnOnStartId = INVALID_STARTID; private int mPendingTurnOnStartId = INVALID_STARTID;
private int mPendingTurnOffStartId = INVALID_STARTID; private int mPendingTurnOffStartId = INVALID_STARTID;
private CheckBox mAudioMediaCheckbox;
@Override @Override
public void onCreate() { public void onCreate() {
if (DEBUG) Log.d(TAG, "onCreate"); if (DEBUG) Log.d(TAG, "onCreate");
@@ -499,6 +501,8 @@ public final class DockService extends Service implements ServiceListener {
View view; View view;
LayoutInflater inflater = (LayoutInflater)getSystemService(LAYOUT_INFLATER_SERVICE); LayoutInflater inflater = (LayoutInflater)getSystemService(LAYOUT_INFLATER_SERVICE);
mAudioMediaCheckbox = null;
if (device != null) { if (device != null) {
// Device in a new dock. // Device in a new dock.
boolean firstTime = boolean firstTime =
@@ -528,14 +532,14 @@ public final class DockService extends Service implements ServiceListener {
ab.setTitle(getString(R.string.bluetooth_dock_settings_title)); ab.setTitle(getString(R.string.bluetooth_dock_settings_title));
view = inflater.inflate(R.layout.dock_audio_media_enable_dialog, null); view = inflater.inflate(R.layout.dock_audio_media_enable_dialog, null);
CheckBox audioMediaCheckbox = mAudioMediaCheckbox =
(CheckBox) view.findViewById(R.id.dock_audio_media_enable_cb); (CheckBox) view.findViewById(R.id.dock_audio_media_enable_cb);
boolean checked = Settings.Global.getInt(getContentResolver(), boolean checked = Settings.Global.getInt(getContentResolver(),
Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0) == 1; Settings.Global.DOCK_AUDIO_MEDIA_ENABLED, 0) == 1;
audioMediaCheckbox.setChecked(checked); mAudioMediaCheckbox.setChecked(checked);
audioMediaCheckbox.setOnCheckedChangeListener(mCheckedChangeListener); mAudioMediaCheckbox.setOnCheckedChangeListener(mCheckedChangeListener);
} }
float pixelScaleFactor = getResources().getDisplayMetrics().density; float pixelScaleFactor = getResources().getDisplayMetrics().density;
@@ -601,19 +605,24 @@ public final class DockService extends Service implements ServiceListener {
private final DialogInterface.OnClickListener mClickListener = private final DialogInterface.OnClickListener mClickListener =
new DialogInterface.OnClickListener() { new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) { public void onClick(DialogInterface dialog, int which) {
if (which == DialogInterface.BUTTON_POSITIVE if (which == DialogInterface.BUTTON_POSITIVE) {
&& mDevice != null) { if (mDevice != null) {
if (!LocalBluetoothPreferences if (!LocalBluetoothPreferences
.hasDockAutoConnectSetting( .hasDockAutoConnectSetting(
DockService.this,
mDevice.getAddress())) {
LocalBluetoothPreferences
.saveDockAutoConnectSetting(
DockService.this, DockService.this,
mDevice.getAddress(), true); mDevice.getAddress())) {
} LocalBluetoothPreferences
.saveDockAutoConnectSetting(
DockService.this,
mDevice.getAddress(), true);
}
applyBtSettings(mDevice, mStartIdAssociatedWithDialog); applyBtSettings(mDevice, mStartIdAssociatedWithDialog);
} else if (mAudioMediaCheckbox != null) {
Settings.Global.putInt(getContentResolver(),
Settings.Global.DOCK_AUDIO_MEDIA_ENABLED,
mAudioMediaCheckbox.isChecked() ? 1 : 0);
}
} }
} }
}; };