diff options
| author | LuK1337 <priv.luk@gmail.com> | 2015-12-25 11:47:40 +0100 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2015-12-27 11:14:56 -0800 |
| commit | 80b4c3500b66b88729fc5f792b7d7719975396b4 (patch) | |
| tree | 27377a0b797e2eaa30557741f43e3e5f4364530e /src/com/android/settings/profiles | |
| parent | 09b4c0c98133888587279b032fece15fc74efb74 (diff) | |
| download | packages_apps_Settings-80b4c3500b66b88729fc5f792b7d7719975396b4.zip packages_apps_Settings-80b4c3500b66b88729fc5f792b7d7719975396b4.tar.gz packages_apps_Settings-80b4c3500b66b88729fc5f792b7d7719975396b4.tar.bz2 | |
Profiles: Fix override item summary not displaying none
* Mismerge from cm-12.1
Change-Id: Ica5bce4f1b371dcf2ad23ba8f938d449a9397339
Diffstat (limited to 'src/com/android/settings/profiles')
| -rw-r--r-- | src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java b/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java index 1ad8573..3214174 100644 --- a/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java +++ b/src/com/android/settings/profiles/actions/item/ConnectionOverrideItem.java @@ -122,7 +122,7 @@ public class ConnectionOverrideItem implements Item { return R.string.profile_action_disable; } } else { - return R.string.profile_action_disable; + return R.string.profile_action_none; } } else { return R.string.profile_action_none; |