Settings: Call Ring mode what Google calls it, not Silent mode (1 of 2)

Silent mode -> Ring mode cleanup

Change-Id: I4c0c182d59ebeb9e2372a24131506f1a111fe33f

2 files changed, 51 insertions, 51 deletions

diff --git a/src/com/android/settings/profiles/ProfileConfig.java b/src/com/android/settings/profiles/ProfileConfig.java
index 6aa2bd3..f908fd4 100644
--- a/src/com/android/settings/profiles/ProfileConfig.java
+++ b/src/com/android/settings/profiles/ProfileConfig.java
@@ -25,7 +25,7 @@ import android.app.ConnectionSettings;
 import android.app.Profile;
 import android.app.ProfileGroup;
 import android.app.ProfileManager;
-import android.app.SilentModeSettings;
+import android.app.RingModeSettings;
 import android.app.StreamSettings;
 import android.content.Context;
 import android.content.DialogInterface;
@@ -74,7 +74,7 @@ public class ProfileConfig extends SettingsPreferenceFragment
 
     private ArrayList<ConnectionItem> mConnections;
 
-    private SilentModeItem mSilentMode;
+    private RingModeItem mRingMode;
 
     private AirplaneModeItem mAirplaneMode;
 
@@ -186,24 +186,24 @@ public class ProfileConfig extends SettingsPreferenceFragment
         PreferenceGroup systemPrefs = (PreferenceGroup) prefSet.findPreference("profile_system_settings");
         if (systemPrefs != null) {
             systemPrefs.removeAll();
-            // Silent mode preference
-            if (mSilentMode == null) {
-                mSilentMode = new SilentModeItem();
+            // Ring mode preference
+            if (mRingMode == null) {
+                mRingMode = new RingModeItem();
             }
-            SilentModeSettings sms = mProfile.getSilentMode();
-            if (sms == null) {
-                sms = new SilentModeSettings();
-                mProfile.setSilentMode(sms);
+            RingModeSettings rms = mProfile.getRingMode();
+            if (rms == null) {
+                rms = new RingModeSettings();
+                mProfile.setRingMode(rms);
             }
-            mSilentMode.mSettings = sms;
-            ProfileSilentModePreference smp = new ProfileSilentModePreference(getActivity());
-            smp.setSilentModeItem(mSilentMode);
-            smp.setTitle(R.string.silent_mode_title);
-            smp.setPersistent(false);
-            smp.setSummary(getActivity());
-            smp.setOnPreferenceChangeListener(this);
-            mSilentMode.mCheckbox = smp;
-            systemPrefs.addPreference(smp);
+            mRingMode.mSettings = rms;
+            ProfileRingModePreference rmp = new ProfileRingModePreference(getActivity());
+            rmp.setRingModeItem(mRingMode);
+            rmp.setTitle(R.string.ring_mode_title);
+            rmp.setPersistent(false);
+            rmp.setSummary(getActivity());
+            rmp.setOnPreferenceChangeListener(this);
+            mRingMode.mCheckbox = rmp;
+            systemPrefs.addPreference(rmp);
 
             // Airplane mode preference
             if (mAirplaneMode == null) {
@@ -315,8 +315,8 @@ public class ProfileConfig extends SettingsPreferenceFragment
                     connection.mSettings.setOverride((Boolean) newValue);
                 }
             }
-        } else if (preference == mSilentMode.mCheckbox) {
-            mSilentMode.mSettings.setOverride((Boolean) newValue);
+        } else if (preference == mRingMode.mCheckbox) {
+            mRingMode.mSettings.setOverride((Boolean) newValue);
         } else if (preference == mAirplaneMode.mCheckbox) {
             mAirplaneMode.mSettings.setOverride((Boolean) newValue);
         } else if (preference == mNamePreference) {
@@ -413,12 +413,12 @@ public class ProfileConfig extends SettingsPreferenceFragment
         }
     }
 
-    static class SilentModeItem {
+    static class RingModeItem {
         String mLabel;
-        SilentModeSettings mSettings;
-        ProfileSilentModePreference mCheckbox;
+        RingModeSettings mSettings;
+        ProfileRingModePreference mCheckbox;
 
-        public SilentModeItem() {
+        public RingModeItem() {
             // nothing to do
         }
     }
diff --git a/src/com/android/settings/profiles/ProfileSilentModePreference.java b/src/com/android/settings/profiles/ProfileRingModePreference.java
index 200bfdb..d471998 100644
--- a/src/com/android/settings/profiles/ProfileSilentModePreference.java
+++ b/src/com/android/settings/profiles/ProfileRingModePreference.java
@@ -30,16 +30,16 @@ import android.widget.LinearLayout;
 
 import com.android.settings.R;
 
-public class ProfileSilentModePreference extends Preference implements
+public class ProfileRingModePreference extends Preference implements
         CompoundButton.OnCheckedChangeListener, View.OnClickListener {
 
     private boolean mProtectFromCheckedChange = false;
 
     private CheckBox mCheckBox;
 
-    final static String TAG = "ProfileSilentModePreference";
+    final static String TAG = "ProfileRingModePreference";
 
-    private ProfileConfig.SilentModeItem mSilentModeItem;
+    private ProfileConfig.RingModeItem mRingModeItem;
 
     final static int defaultChoice = -1;
 
@@ -50,7 +50,7 @@ public class ProfileSilentModePreference extends Preference implements
      * @param attrs
      * @param defStyle
      */
-    public ProfileSilentModePreference(Context context, AttributeSet attrs, int defStyle) {
+    public ProfileRingModePreference(Context context, AttributeSet attrs, int defStyle) {
         super(context, attrs, defStyle);
         init();
     }
@@ -59,7 +59,7 @@ public class ProfileSilentModePreference extends Preference implements
      * @param context
      * @param attrs
      */
-    public ProfileSilentModePreference(Context context, AttributeSet attrs) {
+    public ProfileRingModePreference(Context context, AttributeSet attrs) {
         super(context, attrs);
         init();
     }
@@ -67,7 +67,7 @@ public class ProfileSilentModePreference extends Preference implements
     /**
      * @param context
      */
-    public ProfileSilentModePreference(Context context) {
+    public ProfileRingModePreference(Context context) {
         super(context);
         init();
     }
@@ -99,14 +99,14 @@ public class ProfileSilentModePreference extends Preference implements
     }
 
     public boolean isChecked() {
-        return mSilentModeItem != null && mSilentModeItem.mSettings.isOverride();
+        return mRingModeItem != null && mRingModeItem.mSettings.isOverride();
     }
 
-    public void setSilentModeItem(ProfileConfig.SilentModeItem silentModeItem) {
-        mSilentModeItem = silentModeItem;
+    public void setRingModeItem(ProfileConfig.RingModeItem ringModeItem) {
+        mRingModeItem = ringModeItem;
 
         if (mCheckBox != null) {
-            mCheckBox.setChecked(mSilentModeItem.mSettings.isOverride());
+            mCheckBox.setChecked(mRingModeItem.mSettings.isOverride());
         }
     }
 
@@ -115,26 +115,26 @@ public class ProfileSilentModePreference extends Preference implements
             return;
         }
 
-        mSilentModeItem.mSettings.setOverride(isChecked);
+        mRingModeItem.mSettings.setOverride(isChecked);
 
         callChangeListener(isChecked);
     }
 
-    protected Dialog createSilentModeDialog() {
+    protected Dialog createRingModeDialog() {
         AlertDialog.Builder builder = new AlertDialog.Builder(getContext());
-        final String[] silentModeValues = getContext().getResources().getStringArray(R.array.silent_mode_values);
-        String currentValue = mSilentModeItem.mSettings.getValue();
+        final String[] ringModeValues = getContext().getResources().getStringArray(R.array.ring_mode_values);
+        String currentValue = mRingModeItem.mSettings.getValue();
         if (currentValue != null) {
-            for (int i = 0; i < silentModeValues.length; i++) {
-                if (currentValue.equals(silentModeValues[i])) {
+            for (int i = 0; i < ringModeValues.length; i++) {
+                if (currentValue.equals(ringModeValues[i])) {
                     currentChoice = i;
                     break;
                 }
             }
         }
 
-        builder.setTitle(R.string.silent_mode_title);
-        builder.setSingleChoiceItems(R.array.silent_mode_entries, currentChoice, new DialogInterface.OnClickListener() {
+        builder.setTitle(R.string.ring_mode_title);
+        builder.setSingleChoiceItems(R.array.ring_mode_entries, currentChoice, new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int item) {
                 currentChoice = item;
@@ -145,9 +145,9 @@ public class ProfileSilentModePreference extends Preference implements
             @Override
             public void onClick(DialogInterface dialog, int item) {
                 if (currentChoice != defaultChoice) {
-                    String value = silentModeValues[currentChoice];
-                    mSilentModeItem.mSettings.setValue(value);
-                    setSummary(getContext().getResources().getStringArray(R.array.silent_mode_entries)[currentChoice]);
+                    String value = ringModeValues[currentChoice];
+                    mRingModeItem.mSettings.setValue(value);
+                    setSummary(getContext().getResources().getStringArray(R.array.ring_mode_entries)[currentChoice]);
                 }
             }
         });
@@ -156,22 +156,22 @@ public class ProfileSilentModePreference extends Preference implements
         return builder.create();
     }
 
-    public ProfileConfig.SilentModeItem getSilentModeItem() {
-        return mSilentModeItem;
+    public ProfileConfig.RingModeItem getRingModeItem() {
+        return mRingModeItem;
     }
 
     @Override
     public void onClick(android.view.View v) {
         if ((v != null) && (R.id.text_layout == v.getId())) {
-            createSilentModeDialog().show();
+            createRingModeDialog().show();
         }
     }
 
     public void setSummary(Context context) {
-        String[] entries = context.getResources().getStringArray(R.array.silent_mode_entries);
-        String[] values = context.getResources().getStringArray(R.array.silent_mode_values);
+        String[] entries = context.getResources().getStringArray(R.array.ring_mode_entries);
+        String[] values = context.getResources().getStringArray(R.array.ring_mode_values);
         int l = entries.length;
-        String value = mSilentModeItem.mSettings.getValue();
+        String value = mRingModeItem.mSettings.getValue();
         for (int i = 0; i < l; i++) {
             if (value.equals(values[i])) {
                 setSummary(entries[i]);