7 files changed, 15 insertions, 10 deletions
diff --git a/src/com/android/settings/profiles/actions/item/AirplaneModeItem.java b/src/com/android/settings/profiles/actions/item/AirplaneModeItem.java
index ecacc1b..fbd9620 100644
--- a/src/com/android/settings/profiles/actions/item/AirplaneModeItem.java
+++ b/src/com/android/settings/profiles/actions/item/AirplaneModeItem.java
@@ -15,11 +15,13 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import cyanogenmod.profiles.AirplaneModeSettings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
+import cyanogenmod.profiles.AirplaneModeSettings;
+
 import com.android.settings.R;
 import com.android.settings.profiles.actions.ItemListAdapter;
 
diff --git a/src/com/android/settings/profiles/actions/item/BrightnessItem.java b/src/com/android/settings/profiles/actions/item/BrightnessItem.java
index 223abda..49f0ec9 100644
--- a/src/com/android/settings/profiles/actions/item/BrightnessItem.java
+++ b/src/com/android/settings/profiles/actions/item/BrightnessItem.java
@@ -15,12 +15,14 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import cyanogenmod.profiles.BrightnessSettings;
 import android.content.Context;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+
+import cyanogenmod.profiles.BrightnessSettings;
+
 import com.android.settings.R;
 import com.android.settings.profiles.actions.ItemListAdapter;
 
@@ -73,5 +75,4 @@ public class BrightnessItem implements Item {
     public BrightnessSettings getSettings() {
         return mSettings;
     }
-
 }
diff --git a/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java b/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java
index 3214174..ec7530d 100644
--- a/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java
+++ b/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java
@@ -15,12 +15,13 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import cyanogenmod.profiles.ConnectionSettings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import cyanogenmod.profiles.ConnectionSettings;
+
 import com.android.settings.R;
 import com.android.settings.profiles.actions.ItemListAdapter;
 
diff --git a/src/com/android/settings/profiles/actions/item/DisabledItem.java b/src/com/android/settings/profiles/actions/item/DisabledItem.java
index 3b16c28..f6328af 100644
--- a/src/com/android/settings/profiles/actions/item/DisabledItem.java
+++ b/src/com/android/settings/profiles/actions/item/DisabledItem.java
@@ -63,5 +63,4 @@ public class DisabledItem implements Item {
 
         return view;
     }
-
 }
diff --git a/src/com/android/settings/profiles/actions/item/LockModeItem.java b/src/com/android/settings/profiles/actions/item/LockModeItem.java
index e89bcc8..e04cf19 100644
--- a/src/com/android/settings/profiles/actions/item/LockModeItem.java
+++ b/src/com/android/settings/profiles/actions/item/LockModeItem.java
@@ -64,7 +64,7 @@ public class LockModeItem implements Item {
     public static int getSummaryString(Profile profile) {
         switch (profile.getScreenLockMode().getValue()) {
             case Profile.LockMode.DEFAULT:
-                return R.string.profile_lockmode_default_summary;
+                return R.string.profile_action_system; //"leave unchanged"
             case Profile.LockMode.DISABLE:
                 return R.string.profile_lockmode_disabled_summary;
             case Profile.LockMode.INSECURE:
diff --git a/src/com/android/settings/profiles/actions/item/RingModeItem.java b/src/com/android/settings/profiles/actions/item/RingModeItem.java
index f1c57a3..42fdb91 100644
--- a/src/com/android/settings/profiles/actions/item/RingModeItem.java
+++ b/src/com/android/settings/profiles/actions/item/RingModeItem.java
@@ -15,12 +15,13 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import cyanogenmod.profiles.RingModeSettings;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import cyanogenmod.profiles.RingModeSettings;
+
 import com.android.settings.R;
 import com.android.settings.profiles.actions.ItemListAdapter;
 
@@ -76,7 +77,7 @@ public class RingModeItem implements Item {
                 return R.string.ring_mode_mute;
             }
         } else {
-            return R.string.ring_mode_unchanged;
+            return R.string.profile_action_none; //"leave unchanged"
         }
     }
 
diff --git a/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java b/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java
index 23db18d..9bcf2ef 100644
--- a/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java
+++ b/src/com/android/settings/profiles/actions/item/VolumeStreamItem.java
@@ -15,7 +15,6 @@
  */
 package com.android.settings.profiles.actions.item;
 
-import cyanogenmod.profiles.StreamSettings;
 import android.content.Context;
 import android.media.AudioManager;
 import android.view.LayoutInflater;
@@ -23,6 +22,8 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
 
+import cyanogenmod.profiles.StreamSettings;
+
 import com.android.settings.R;
 import com.android.settings.profiles.actions.ItemListAdapter;
 
@@ -68,7 +69,7 @@ public class VolumeStreamItem implements Item {
             desc.setText(context.getResources().getString(R.string.volume_override_summary,
                     denominator, numerator));
         } else {
-            desc.setText(context.getString(R.string.volume_override_summary_no_override));
+            desc.setText(context.getString(R.string.profile_action_none));
         }
 
         return view;