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

auto import from //branches/cupcake/...@137197

Browse Source
This commit is contained in:
The Android Open Source Project
2009-03-09 11:52:14 -07:00
parent 86997beac8
commit 648bf5fd9e
6 changed files with 37 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/SoundAndDisplaySettings.java
View File

@@ -50,6 +50,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
private static final String KEY_DTMF_TONE = "dtmf_tone";
private static final String KEY_SOUND_EFFECTS = "sound_effects";
private static final String KEY_ANIMATIONS = "animations";
private static final String KEY_ACCELEROMETER = "accelerometer";
private static final String KEY_PLAY_MEDIA_NOTIFICATION_SOUNDS = "play_media_notification_sounds";
private CheckBoxPreference mSilent;
@@ -69,6 +70,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
private CheckBoxPreference mDtmfTone;
private CheckBoxPreference mSoundEffects;
private CheckBoxPreference mAnimations;
private CheckBoxPreference mAccelerometer;
private float[] mAnimationScales;
private AudioManager mAudioManager;
@@ -108,6 +110,8 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
Settings.System.SOUND_EFFECTS_ENABLED, 0) != 0);
mAnimations = (CheckBoxPreference) findPreference(KEY_ANIMATIONS);
mAnimations.setPersistent(false);
mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
mAccelerometer.setPersistent(false);
ListPreference screenTimeoutPreference =
(ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
@@ -174,6 +178,9 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
if (animations != mAnimations.isChecked() || force) {
mAnimations.setChecked(animations);
}
mAccelerometer.setChecked(Settings.System.getInt(
getContentResolver(),
Settings.System.ACCELEROMETER_ROTATION, 0) != 0);
}
@Override
@@ -224,6 +231,11 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
mWindowManager.setAnimationScales(mAnimationScales);
} catch (RemoteException e) {
}
} else if (preference == mAccelerometer) {
Settings.System.putInt(getContentResolver(),
Settings.System.ACCELEROMETER_ROTATION,
mAccelerometer.isChecked() ? 1 : 0);
}
return true;
}

5
src/com/android/settings/bluetooth/BluetoothDiscoverableEnabler.java
View File

@@ -127,7 +127,10 @@ public class BluetoothDiscoverableEnabler implements Preference.OnPreferenceChan
int timeout = getDiscoverableTimeout();
manager.setDiscoverableTimeout(timeout);
mCheckBoxPreference.setSummaryOn(
mContext.getResources().getString(R.string.bluetooth_is_discoverable, timeout));
long endTimestamp = System.currentTimeMillis() + timeout * 1000;
persistDiscoverableEndTimestamp(endTimestamp);

6
src/com/android/settings/bluetooth/LocalBluetoothProfileManager.java
View File

@@ -132,6 +132,12 @@ public abstract class LocalBluetoothProfileManager {
@Override
public int connect(String address) {
List<String> sinks = mService.listConnectedSinks();
if (sinks != null) {
for (String sinkAddress : sinks) {
mService.disconnectSink(sinkAddress);
}
}
return mService.connectSink(address);
}