Framework: Call Ring mode what Google calls it, not Silent mode (2 of 2) (8b2e4944) · Commits · e / os / android_frameworks_base

core/java/android/app/Profile.java

+14 −14

Original line number	Diff line number	Diff line
		@@ -68,7 +68,7 @@ public final class Profile implements Parcelable, Comparable {

		private Map<Integer, ConnectionSettings> connections = new HashMap<Integer, ConnectionSettings>();

		private SilentModeSettings mSilentMode = new SilentModeSettings();
		private RingModeSettings mRingMode = new RingModeSettings();

		private AirplaneModeSettings mAirplaneMode = new AirplaneModeSettings();

		@@ -181,7 +181,7 @@ public final class Profile implements Parcelable, Comparable {
		streams.values().toArray(new Parcelable[streams.size()]), flags);
		dest.writeParcelableArray(
		connections.values().toArray(new Parcelable[connections.size()]), flags);
		dest.writeParcelable(mSilentMode, flags);
		dest.writeParcelable(mRingMode, flags);
		dest.writeParcelable(mAirplaneMode, flags);
		dest.writeInt(mScreenLockMode);
		}
		@@ -213,7 +213,7 @@ public final class Profile implements Parcelable, Comparable {
		ConnectionSettings connection = (ConnectionSettings) parcel;
		connections.put(connection.getConnectionId(), connection);
		}
		mSilentMode = (SilentModeSettings) in.readParcelable(null);
		mRingMode = (RingModeSettings) in.readParcelable(null);
		mAirplaneMode = (AirplaneModeSettings) in.readParcelable(null);
		mScreenLockMode = in.readInt();
		}
		@@ -281,12 +281,12 @@ public final class Profile implements Parcelable, Comparable {
		mDirty = true;
		}

		public SilentModeSettings getSilentMode() {
		return mSilentMode;
		public RingModeSettings getRingMode() {
		return mRingMode;
		}

		public void setSilentMode(SilentModeSettings descriptor) {
		mSilentMode = descriptor;
		public void setRingMode(RingModeSettings descriptor) {
		mRingMode = descriptor;
		mDirty = true;
		}

		@@ -332,7 +332,7 @@ public final class Profile implements Parcelable, Comparable {
		return true;
		}
		}
		if (mSilentMode.isDirty()) {
		if (mRingMode.isDirty()) {
		return true;
		}
		if (mAirplaneMode.isDirty()) {
		@@ -377,7 +377,7 @@ public final class Profile implements Parcelable, Comparable {

		mAirplaneMode.getXmlString(builder, context);

		mSilentMode.getXmlString(builder, context);
		mRingMode.getXmlString(builder, context);

		for (ProfileGroup pGroup : profileGroups.values()) {
		pGroup.getXmlString(builder, context);
		@@ -466,9 +466,9 @@ public final class Profile implements Parcelable, Comparable {
		if (name.equals("profiletype")) {
		profile.setProfileType(xpp.nextText().equals("toggle") ? TOGGLE_TYPE : CONDITIONAL_TYPE);
		}
		if (name.equals("silentModeDescriptor")) {
		SilentModeSettings smd = SilentModeSettings.fromXml(xpp, context);
		profile.setSilentMode(smd);
		if (name.equals("ringModeDescriptor")) {
		RingModeSettings smd = RingModeSettings.fromXml(xpp, context);
		profile.setRingMode(smd);
		}
		if (name.equals("airplaneModeDescriptor")) {
		AirplaneModeSettings amd = AirplaneModeSettings.fromXml(xpp, context);
		@@ -514,8 +514,8 @@ public final class Profile implements Parcelable, Comparable {
		cs.processOverride(context);
		}
		}
		// Set silent mode
		mSilentMode.processOverride(context);
		// Set ring mode
		mRingMode.processOverride(context);
		// Set airplane mode
		mAirplaneMode.processOverride(context);
		}

core/java/android/app/SilentModeSettings.java→core/java/android/app/RingModeSettings.java

+19 −19

Original line number	Diff line number	Diff line
		@@ -11,37 +11,37 @@ import org.xmlpull.v1.XmlPullParserException;
		import java.io.IOException;

		/** @hide */
		public final class SilentModeSettings implements Parcelable {
		private static final String SILENT_MODE_OFF = "off";
		private static final String SILENT_MODE_VIBRATE = "vibrate";
		private static final String SILENT_MODE_MUTE = "mute";
		public final class RingModeSettings implements Parcelable {
		private static final String RING_MODE_NORMAL = "normal";
		private static final String RING_MODE_VIBRATE = "vibrate";
		private static final String RING_MODE_MUTE = "mute";

		private String mValue;
		private boolean mOverride;
		private boolean mDirty;

		/** @hide */
		public static final Parcelable.Creator<SilentModeSettings> CREATOR = new Parcelable.Creator<SilentModeSettings>() {
		public SilentModeSettings createFromParcel(Parcel in) {
		return new SilentModeSettings(in);
		public static final Parcelable.Creator<RingModeSettings> CREATOR = new Parcelable.Creator<RingModeSettings>() {
		public RingModeSettings createFromParcel(Parcel in) {
		return new RingModeSettings(in);
		}

		@Override
		public SilentModeSettings[] newArray(int size) {
		return new SilentModeSettings[size];
		public RingModeSettings[] newArray(int size) {
		return new RingModeSettings[size];
		}
		};


		public SilentModeSettings(Parcel parcel) {
		public RingModeSettings(Parcel parcel) {
		readFromParcel(parcel);
		}

		public SilentModeSettings() {
		this(SILENT_MODE_OFF, false);
		public RingModeSettings() {
		this(RING_MODE_NORMAL, false);
		}

		public SilentModeSettings(String value, boolean override) {
		public RingModeSettings(String value, boolean override) {
		mValue = value;
		mOverride = override;
		mDirty = false;
		@@ -73,9 +73,9 @@ public final class SilentModeSettings implements Parcelable {
		public void processOverride(Context context) {
		if (isOverride()) {
		int ringerMode = AudioManager.RINGER_MODE_NORMAL;
		if (mValue.equals(SILENT_MODE_MUTE)) {
		if (mValue.equals(RING_MODE_MUTE)) {
		ringerMode = AudioManager.RINGER_MODE_SILENT;
		} else if (mValue.equals(SILENT_MODE_VIBRATE)) {
		} else if (mValue.equals(RING_MODE_VIBRATE)) {
		ringerMode = AudioManager.RINGER_MODE_VIBRATE;
		}
		AudioManager amgr = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE);
		@@ -84,10 +84,10 @@ public final class SilentModeSettings implements Parcelable {
		}

		/** @hide */
		public static SilentModeSettings fromXml(XmlPullParser xpp, Context context)
		public static RingModeSettings fromXml(XmlPullParser xpp, Context context)
		throws XmlPullParserException, IOException {
		int event = xpp.next();
		SilentModeSettings connectionDescriptor = new SilentModeSettings();
		RingModeSettings connectionDescriptor = new RingModeSettings();
		while (event != XmlPullParser.END_TAG) {
		if (event == XmlPullParser.START_TAG) {
		String name = xpp.getName();
		@@ -104,11 +104,11 @@ public final class SilentModeSettings implements Parcelable {

		/** @hide */
		public void getXmlString(StringBuilder builder, Context context) {
		builder.append("<silentModeDescriptor>\n<value>");
		builder.append("<ringModeDescriptor>\n<value>");
		builder.append(mValue);
		builder.append("</value>\n<override>");
		builder.append(mOverride);
		builder.append("</override>\n</silentModeDescriptor>\n");
		builder.append("</override>\n</ringModeDescriptor>\n");
		}

		@Override

core/java/android/provider/Settings.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -3068,7 +3068,7 @@ public final class Settings {
		* Whether power menu silent mode is enabled
		* @hide
		*/
		public static final String POWER_MENU_SILENT_ENABLED = "power_menu_silent_enabled";
		public static final String POWER_MENU_SOUND_ENABLED = "power_menu_silent_enabled";

		/**
		* Volume keys control cursor in text fields (default is 0)
		@@ -3162,7 +3162,7 @@ public final class Settings {
		POWER_MENU_REBOOT_ENABLED,
		POWER_MENU_PROFILES_ENABLED,
		POWER_MENU_AIRPLANE_ENABLED,
		POWER_MENU_SILENT_ENABLED,
		POWER_MENU_SOUND_ENABLED,
		POWER_MENU_USER_ENABLED,
		};

policy/src/com/android/internal/policy/impl/GlobalActions.java

+1 −1

Original line number	Diff line number	Diff line
		@@ -418,7 +418,7 @@ class GlobalActions implements DialogInterface.OnDismissListener, DialogInterfac

		// last: silent mode
		if ((Settings.System.getInt(mContext.getContentResolver(),
		Settings.System.POWER_MENU_SILENT_ENABLED, 1) == 1) &&
		Settings.System.POWER_MENU_SOUND_ENABLED, 1) == 1) &&
		(mShowSilentToggle)) {
		mItems.add(mSilentModeAction);
		}