android-2.1_r1 snapshot
This commit is contained in:
@@ -17,7 +17,8 @@
|
||||
package com.android.settings;
|
||||
|
||||
import static android.provider.Settings.System.SCREEN_OFF_TIMEOUT;
|
||||
import static android.provider.Settings.System.COMPATIBILITY_MODE;
|
||||
|
||||
import com.android.settings.bluetooth.DockEventReceiver;
|
||||
|
||||
import android.content.BroadcastReceiver;
|
||||
import android.content.ContentResolver;
|
||||
@@ -29,15 +30,17 @@ import android.os.Bundle;
|
||||
import android.os.IMountService;
|
||||
import android.os.RemoteException;
|
||||
import android.os.ServiceManager;
|
||||
import android.preference.CheckBoxPreference;
|
||||
import android.preference.ListPreference;
|
||||
import android.preference.Preference;
|
||||
import android.preference.PreferenceActivity;
|
||||
import android.preference.PreferenceGroup;
|
||||
import android.preference.PreferenceScreen;
|
||||
import android.preference.CheckBoxPreference;
|
||||
import android.provider.Settings;
|
||||
import android.provider.Settings.SettingNotFoundException;
|
||||
import android.telephony.TelephonyManager;
|
||||
import android.util.Log;
|
||||
import android.view.IWindowManager;
|
||||
import android.telephony.TelephonyManager;
|
||||
|
||||
public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
Preference.OnPreferenceChangeListener {
|
||||
@@ -46,7 +49,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
/** If there is no setting in the provider, use this. */
|
||||
private static final int FALLBACK_SCREEN_TIMEOUT_VALUE = 30000;
|
||||
private static final int FALLBACK_EMERGENCY_TONE_VALUE = 0;
|
||||
|
||||
|
||||
private static final String KEY_SILENT = "silent";
|
||||
private static final String KEY_VIBRATE = "vibrate";
|
||||
private static final String KEY_SCREEN_TIMEOUT = "screen_timeout";
|
||||
@@ -55,13 +58,20 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
private static final String KEY_HAPTIC_FEEDBACK = "haptic_feedback";
|
||||
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 static final String KEY_EMERGENCY_TONE ="emergency_tone";
|
||||
|
||||
private static final String KEY_PLAY_MEDIA_NOTIFICATION_SOUNDS =
|
||||
"play_media_notification_sounds";
|
||||
private static final String KEY_EMERGENCY_TONE = "emergency_tone";
|
||||
private static final String KEY_SOUND_SETTINGS = "sound_settings";
|
||||
private static final String KEY_NOTIFICATION_PULSE = "notification_pulse";
|
||||
private static final String KEY_DOCK_SETTINGS = "dock_settings";
|
||||
|
||||
private CheckBoxPreference mSilent;
|
||||
|
||||
private CheckBoxPreference mPlayMediaNotificationSounds;
|
||||
|
||||
private Preference mDockSettings;
|
||||
private boolean mHasDockSettings;
|
||||
|
||||
private IMountService mMountService = null;
|
||||
|
||||
/*
|
||||
@@ -77,36 +87,45 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
private CheckBoxPreference mHapticFeedback;
|
||||
private ListPreference mAnimations;
|
||||
private CheckBoxPreference mAccelerometer;
|
||||
private CheckBoxPreference mNotificationPulse;
|
||||
private float[] mAnimationScales;
|
||||
|
||||
|
||||
private AudioManager mAudioManager;
|
||||
|
||||
|
||||
private IWindowManager mWindowManager;
|
||||
|
||||
private BroadcastReceiver mReceiver = new BroadcastReceiver() {
|
||||
@Override
|
||||
public void onReceive(Context context, Intent intent) {
|
||||
updateState(false);
|
||||
if (intent.getAction().equals(AudioManager.RINGER_MODE_CHANGED_ACTION)) {
|
||||
updateState(false);
|
||||
} else if (intent.getAction().equals(Intent.ACTION_DOCK_EVENT)) {
|
||||
handleDockChange(intent);
|
||||
}
|
||||
}
|
||||
};
|
||||
|
||||
private PreferenceGroup mSoundSettings;
|
||||
|
||||
private Intent mDockIntent;
|
||||
|
||||
@Override
|
||||
protected void onCreate(Bundle savedInstanceState) {
|
||||
super.onCreate(savedInstanceState);
|
||||
ContentResolver resolver = getContentResolver();
|
||||
int activePhoneType = TelephonyManager.getDefault().getPhoneType();
|
||||
|
||||
|
||||
mAudioManager = (AudioManager) getSystemService(Context.AUDIO_SERVICE);
|
||||
mWindowManager = IWindowManager.Stub.asInterface(ServiceManager.getService("window"));
|
||||
|
||||
mMountService = IMountService.Stub.asInterface(ServiceManager.getService("mount"));
|
||||
|
||||
|
||||
addPreferencesFromResource(R.xml.sound_and_display_settings);
|
||||
|
||||
|
||||
if (TelephonyManager.PHONE_TYPE_CDMA != activePhoneType) {
|
||||
// device is not CDMA, do not display CDMA emergency_tone
|
||||
getPreferenceScreen().removePreference(findPreference(KEY_EMERGENCY_TONE));
|
||||
}
|
||||
}
|
||||
|
||||
mSilent = (CheckBoxPreference) findPreference(KEY_SILENT);
|
||||
mPlayMediaNotificationSounds = (CheckBoxPreference) findPreference(KEY_PLAY_MEDIA_NOTIFICATION_SOUNDS);
|
||||
@@ -128,7 +147,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
mAnimations.setOnPreferenceChangeListener(this);
|
||||
mAccelerometer = (CheckBoxPreference) findPreference(KEY_ACCELEROMETER);
|
||||
mAccelerometer.setPersistent(false);
|
||||
|
||||
|
||||
ListPreference screenTimeoutPreference =
|
||||
(ListPreference) findPreference(KEY_SCREEN_TIMEOUT);
|
||||
screenTimeoutPreference.setValue(String.valueOf(Settings.System.getInt(
|
||||
@@ -142,15 +161,39 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
resolver, Settings.System.EMERGENCY_TONE, FALLBACK_EMERGENCY_TONE_VALUE)));
|
||||
emergencyTonePreference.setOnPreferenceChangeListener(this);
|
||||
}
|
||||
|
||||
mSoundSettings = (PreferenceGroup) findPreference(KEY_SOUND_SETTINGS);
|
||||
mNotificationPulse = (CheckBoxPreference)
|
||||
mSoundSettings.findPreference(KEY_NOTIFICATION_PULSE);
|
||||
if (mNotificationPulse != null &&
|
||||
getResources().getBoolean(R.bool.has_intrusive_led) == false) {
|
||||
mSoundSettings.removePreference(mNotificationPulse);
|
||||
} else {
|
||||
try {
|
||||
mNotificationPulse.setChecked(Settings.System.getInt(resolver,
|
||||
Settings.System.NOTIFICATION_LIGHT_PULSE) == 1);
|
||||
mNotificationPulse.setOnPreferenceChangeListener(this);
|
||||
} catch (SettingNotFoundException snfe) {
|
||||
Log.e(TAG, Settings.System.NOTIFICATION_LIGHT_PULSE + " not found");
|
||||
}
|
||||
}
|
||||
|
||||
initDockSettings();
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
protected void onResume() {
|
||||
super.onResume();
|
||||
|
||||
|
||||
updateState(true);
|
||||
|
||||
|
||||
IntentFilter filter = new IntentFilter(AudioManager.RINGER_MODE_CHANGED_ACTION);
|
||||
if (mHasDockSettings) {
|
||||
if (mDockSettings != null) {
|
||||
mSoundSettings.removePreference(mDockSettings);
|
||||
}
|
||||
filter.addAction(Intent.ACTION_DOCK_EVENT);
|
||||
}
|
||||
registerReceiver(mReceiver, filter);
|
||||
}
|
||||
|
||||
@@ -161,11 +204,39 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
unregisterReceiver(mReceiver);
|
||||
}
|
||||
|
||||
private void initDockSettings() {
|
||||
mDockSettings = mSoundSettings.findPreference(KEY_DOCK_SETTINGS);
|
||||
mHasDockSettings = getResources().getBoolean(R.bool.has_dock_settings);
|
||||
if (mDockSettings != null) {
|
||||
mSoundSettings.removePreference(mDockSettings);
|
||||
// Don't care even if we dock
|
||||
if (getResources().getBoolean(R.bool.has_dock_settings) == false) {
|
||||
mDockSettings = null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void handleDockChange(Intent intent) {
|
||||
if (mHasDockSettings && mDockSettings != null) {
|
||||
int dockState = intent.getIntExtra(Intent.EXTRA_DOCK_STATE, 0);
|
||||
if (dockState != Intent.EXTRA_DOCK_STATE_UNDOCKED) {
|
||||
// Show dock settings item
|
||||
mSoundSettings.addPreference(mDockSettings);
|
||||
|
||||
// Save the intent to send to the activity
|
||||
mDockIntent = intent;
|
||||
} else {
|
||||
// Remove dock settings item
|
||||
mSoundSettings.removePreference(mDockSettings);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void updateState(boolean force) {
|
||||
final int ringerMode = mAudioManager.getRingerMode();
|
||||
final boolean silentOrVibrateMode =
|
||||
ringerMode != AudioManager.RINGER_MODE_NORMAL;
|
||||
|
||||
|
||||
if (silentOrVibrateMode != mSilent.isChecked() || force) {
|
||||
mSilent.setChecked(silentOrVibrateMode);
|
||||
}
|
||||
@@ -174,25 +245,25 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
mPlayMediaNotificationSounds.setChecked(mMountService.getPlayNotificationSounds());
|
||||
} catch (RemoteException e) {
|
||||
}
|
||||
|
||||
|
||||
boolean vibrateSetting;
|
||||
if (silentOrVibrateMode) {
|
||||
vibrateSetting = ringerMode == AudioManager.RINGER_MODE_VIBRATE;
|
||||
} else {
|
||||
vibrateSetting = mAudioManager.getVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER)
|
||||
== AudioManager.VIBRATE_SETTING_ON;
|
||||
== AudioManager.VIBRATE_SETTING_ON;
|
||||
}
|
||||
if (vibrateSetting != mVibrate.isChecked() || force) {
|
||||
mVibrate.setChecked(vibrateSetting);
|
||||
}
|
||||
|
||||
|
||||
int silentModeStreams = Settings.System.getInt(getContentResolver(),
|
||||
Settings.System.MODE_RINGER_STREAMS_AFFECTED, 0);
|
||||
boolean isAlarmInclSilentMode = (silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0;
|
||||
boolean isAlarmInclSilentMode = (silentModeStreams & (1 << AudioManager.STREAM_ALARM)) != 0;
|
||||
mSilent.setSummary(isAlarmInclSilentMode ?
|
||||
R.string.silent_mode_incl_alarm_summary :
|
||||
R.string.silent_mode_summary);
|
||||
|
||||
|
||||
int animations = 0;
|
||||
try {
|
||||
mAnimationScales = mWindowManager.getAnimationScales();
|
||||
@@ -219,7 +290,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
mAnimations.setValueIndex(idx);
|
||||
updateAnimationsSummary(mAnimations.getValue());
|
||||
mAccelerometer.setChecked(Settings.System.getInt(
|
||||
getContentResolver(),
|
||||
getContentResolver(),
|
||||
Settings.System.ACCELEROMETER_ROTATION, 0) != 0);
|
||||
}
|
||||
|
||||
@@ -235,7 +306,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
private void setRingerMode(boolean silent, boolean vibrate) {
|
||||
if (silent) {
|
||||
mAudioManager.setRingerMode(vibrate ? AudioManager.RINGER_MODE_VIBRATE :
|
||||
@@ -261,7 +332,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
} else if (preference == mDtmfTone) {
|
||||
Settings.System.putInt(getContentResolver(), Settings.System.DTMF_TONE_WHEN_DIALING,
|
||||
mDtmfTone.isChecked() ? 1 : 0);
|
||||
|
||||
|
||||
} else if (preference == mSoundEffects) {
|
||||
if (mSoundEffects.isChecked()) {
|
||||
mAudioManager.loadSoundEffects();
|
||||
@@ -274,17 +345,28 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
} else if (preference == mHapticFeedback) {
|
||||
Settings.System.putInt(getContentResolver(), Settings.System.HAPTIC_FEEDBACK_ENABLED,
|
||||
mHapticFeedback.isChecked() ? 1 : 0);
|
||||
|
||||
|
||||
} else if (preference == mAccelerometer) {
|
||||
Settings.System.putInt(getContentResolver(),
|
||||
Settings.System.ACCELEROMETER_ROTATION,
|
||||
mAccelerometer.isChecked() ? 1 : 0);
|
||||
} else if (preference == mNotificationPulse) {
|
||||
boolean value = mNotificationPulse.isChecked();
|
||||
Settings.System.putInt(getContentResolver(),
|
||||
Settings.System.NOTIFICATION_LIGHT_PULSE, value ? 1 : 0);
|
||||
} else if (preference == mDockSettings) {
|
||||
Intent i = new Intent(mDockIntent);
|
||||
i.setAction(DockEventReceiver.ACTION_DOCK_SHOW_UI);
|
||||
i.setClass(this, DockEventReceiver.class);
|
||||
sendBroadcast(i);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
public boolean onPreferenceChange(Preference preference, Object objValue) {
|
||||
if (KEY_ANIMATIONS.equals(preference.getKey())) {
|
||||
final String key = preference.getKey();
|
||||
if (KEY_ANIMATIONS.equals(key)) {
|
||||
try {
|
||||
int value = Integer.parseInt((String) objValue);
|
||||
if (mAnimationScales.length >= 1) {
|
||||
@@ -301,17 +383,17 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
} catch (NumberFormatException e) {
|
||||
Log.e(TAG, "could not persist animation setting", e);
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
if (KEY_SCREEN_TIMEOUT.equals(preference.getKey())) {
|
||||
if (KEY_SCREEN_TIMEOUT.equals(key)) {
|
||||
int value = Integer.parseInt((String) objValue);
|
||||
try {
|
||||
Settings.System.putInt(getContentResolver(),
|
||||
Settings.System.putInt(getContentResolver(),
|
||||
SCREEN_OFF_TIMEOUT, value);
|
||||
} catch (NumberFormatException e) {
|
||||
Log.e(TAG, "could not persist screen timeout setting", e);
|
||||
}
|
||||
} else if (KEY_EMERGENCY_TONE.equals(preference.getKey())) {
|
||||
} else if (KEY_EMERGENCY_TONE.equals(key)) {
|
||||
int value = Integer.parseInt((String) objValue);
|
||||
try {
|
||||
Settings.System.putInt(getContentResolver(),
|
||||
@@ -320,8 +402,7 @@ public class SoundAndDisplaySettings extends PreferenceActivity implements
|
||||
Log.e(TAG, "could not persist emergency tone setting", e);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user