am c8ade15d: Merge "Silent and Vibrate mode clean up" into jb-dev (776339fe) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+3 −2

Original line number	Diff line number	Diff line
		@@ -1557,6 +1557,9 @@ public final class Settings {
		* will likely be removed in a future release with support for
		* audio/vibe feedback profiles.
		*
		* Not used anymore. On devices with vibrator, the user explicitly selects
		* silent or vibrate mode.
		* Kept for use by legacy database upgrade code in DatabaseHelper.
		* @hide
		*/
		public static final String VIBRATE_IN_SILENT = "vibrate_in_silent";
		@@ -1983,7 +1986,6 @@ public final class Settings {
		SCREEN_BRIGHTNESS,
		SCREEN_BRIGHTNESS_MODE,
		SCREEN_AUTO_BRIGHTNESS_ADJ,
		VIBRATE_ON,
		VIBRATE_INPUT_DEVICES,
		MODE_RINGER,
		MODE_RINGER_STREAMS_AFFECTED,
		@@ -2002,7 +2004,6 @@ public final class Settings {
		VOLUME_ALARM + APPEND_FOR_LAST_AUDIBLE,
		VOLUME_NOTIFICATION + APPEND_FOR_LAST_AUDIBLE,
		VOLUME_BLUETOOTH_SCO + APPEND_FOR_LAST_AUDIBLE,
		VIBRATE_IN_SILENT,
		TEXT_AUTO_REPLACE,
		TEXT_AUTO_CAPS,
		TEXT_AUTO_PUNCTUATE,

media/java/android/media/AudioService.java

+152 −84

File changed.

Preview size limit exceeded, changes collapsed.

media/java/android/media/AudioSystem.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -260,6 +260,8 @@ public class AudioSystem
		public static final String DEVICE_OUT_AUX_DIGITAL_NAME = "aux_digital";
		public static final String DEVICE_OUT_ANLG_DOCK_HEADSET_NAME = "analog_dock";
		public static final String DEVICE_OUT_DGTL_DOCK_HEADSET_NAME = "digital_dock";
		public static final String DEVICE_OUT_USB_ACCESSORY_NAME = "usb_accessory";
		public static final String DEVICE_OUT_USB_DEVICE_NAME = "usb_device";

		public static String getDeviceName(int device)
		{
		@@ -290,6 +292,10 @@ public class AudioSystem
		return DEVICE_OUT_ANLG_DOCK_HEADSET_NAME;
		case DEVICE_OUT_DGTL_DOCK_HEADSET:
		return DEVICE_OUT_DGTL_DOCK_HEADSET_NAME;
		case DEVICE_OUT_USB_ACCESSORY:
		return DEVICE_OUT_USB_ACCESSORY_NAME;
		case DEVICE_OUT_USB_DEVICE:
		return DEVICE_OUT_USB_DEVICE_NAME;
		case DEVICE_IN_DEFAULT:
		default:
		return "";

packages/SettingsProvider/src/com/android/providers/settings/DatabaseHelper.java

+18 −6

Original line number	Diff line number	Diff line
		@@ -63,7 +63,7 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		// database gets upgraded properly. At a minimum, please confirm that 'upgradeVersion'
		// is properly propagated through your change. Not doing so will result in a loss of user
		// settings.
		private static final int DATABASE_VERSION = 76;
		private static final int DATABASE_VERSION = 77;

		private Context mContext;

		@@ -1031,6 +1031,23 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		upgradeVersion = 76;
		}

		/*********** The following are Jelly Bean changes **********/

		if (upgradeVersion == 76) {
		// Removed VIBRATE_IN_SILENT setting
		db.beginTransaction();
		try {
		db.execSQL("DELETE FROM system WHERE name='"
		+ Settings.System.VIBRATE_IN_SILENT + "'");
		db.setTransactionSuccessful();
		} finally {
		db.endTransaction();
		}

		upgradeVersion = 77;
		}


		// *** Remember to update DATABASE_VERSION above!

		if (upgradeVersion != currentVersion) {
		@@ -1311,8 +1328,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {
		loadSetting(stmt, Settings.System.MODE_RINGER,
		AudioManager.RINGER_MODE_NORMAL);

		loadVibrateSetting(db, false);

		// By default:
		// - ringtones, notification, system and music streams are affected by ringer mode
		// on non voice capable devices (tablets)
		@@ -1433,9 +1448,6 @@ public class DatabaseHelper extends SQLiteOpenHelper {

		loadUISoundEffectsSettings(stmt);

		loadBooleanSetting(stmt, Settings.System.VIBRATE_IN_SILENT,
		R.bool.def_vibrate_in_silent);

		loadIntegerSetting(stmt, Settings.System.POINTER_SPEED,
		R.integer.def_pointer_speed);

packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java

+0 −15

Original line number	Diff line number	Diff line
		@@ -43,9 +43,6 @@ public class SettingsHelper {
		private IContentService mContentService;
		private IPowerManager mPowerManager;

		private boolean mSilent;
		private boolean mVibrate;

		public SettingsHelper(Context context) {
		mContext = context;
		mAudioManager = (AudioManager) context
		@@ -119,18 +116,6 @@ public class SettingsHelper {
		}
		}

		private void setRingerMode() {
		if (mSilent) {
		mAudioManager.setRingerMode(mVibrate ? AudioManager.RINGER_MODE_VIBRATE :
		AudioManager.RINGER_MODE_SILENT);
		} else {
		mAudioManager.setRingerMode(AudioManager.RINGER_MODE_NORMAL);
		mAudioManager.setVibrateSetting(AudioManager.VIBRATE_TYPE_RINGER,
		mVibrate ? AudioManager.VIBRATE_SETTING_ON
		: AudioManager.VIBRATE_SETTING_OFF);
		}
		}

		byte[] getLocaleData() {
		Configuration conf = mContext.getResources().getConfiguration();
		final Locale loc = conf.locale;