diff options
| author | Amith Yamasani <yamasani@google.com> | 2012-09-23 12:54:14 -0700 |
|---|---|---|
| committer | Amith Yamasani <yamasani@google.com> | 2012-09-23 18:43:31 -0700 |
| commit | 9627a8ea151c1f27e5e9f34592c7b34fea3101c3 (patch) | |
| tree | 3c92cd339e0df9ae47ac4ab92964d9b5aab36c10 /src/com/android/settings/DeviceInfoSettings.java | |
| parent | b105531116148d5d29e113e611ac180aa9691c6e (diff) | |
| download | packages_apps_settings-9627a8ea151c1f27e5e9f34592c7b34fea3101c3.zip packages_apps_settings-9627a8ea151c1f27e5e9f34592c7b34fea3101c3.tar.gz packages_apps_settings-9627a8ea151c1f27e5e9f34592c7b34fea3101c3.tar.bz2 | |
Show more settings and add restrictions/dialogs for secondary users
Bug: 7213029 crash in About>Status
Bug: 7212495 hide System updates for second user
Bug: 7212230 nickname editor should select the text
Bug: 7160487 TTS settings
Bug: 7129411 Settings needs visibility changes for secondary users
Change-Id: Ia2d1229c08b392edfa6b671fce4a382410405b14
Diffstat (limited to 'src/com/android/settings/DeviceInfoSettings.java')
| -rw-r--r-- | src/com/android/settings/DeviceInfoSettings.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/com/android/settings/DeviceInfoSettings.java b/src/com/android/settings/DeviceInfoSettings.java index eb9e918..5f35871 100644 --- a/src/com/android/settings/DeviceInfoSettings.java +++ b/src/com/android/settings/DeviceInfoSettings.java @@ -26,6 +26,7 @@ import android.os.Bundle; import android.os.SELinux; import android.os.SystemClock; import android.os.SystemProperties; +import android.os.UserHandle; import android.preference.Preference; import android.preference.PreferenceGroup; import android.preference.PreferenceScreen; @@ -126,9 +127,14 @@ public class DeviceInfoSettings extends SettingsPreferenceFragment { // These are contained by the root preference screen parentPreference = getPreferenceScreen(); - Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, - KEY_SYSTEM_UPDATE_SETTINGS, - Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY); + if (UserHandle.myUserId() == UserHandle.USER_OWNER) { + Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, + KEY_SYSTEM_UPDATE_SETTINGS, + Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY); + } else { + // Remove for secondary users + removePreference(KEY_SYSTEM_UPDATE_SETTINGS); + } Utils.updatePreferenceToSpecificActivityOrRemove(act, parentPreference, KEY_CONTRIBUTORS, Utils.UPDATE_PREFERENCE_FLAG_SET_TITLE_TO_MATCHING_ACTIVITY); |